Skip to content

New jen #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bluejenny wants to merge 7 commits into
base: master
Choose a base branch
from
Open

New jen #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
82d8e28
design updates
bluejenny Mar 29, 2017
630b8c5
Update fr.yml
kiramclean Mar 30, 2017
d98787e
new updates
bluejenny Apr 7, 2017
28e3e33
later updates
bluejenny Apr 10, 2017
48e9aac
Merge branch 'master' into new_jen
kiramclean Apr 10, 2017
0060f15
Social Icons
bluejenny Apr 24, 2017
2d274f3
Merge branch 'master' into new_jen
kiramclean Apr 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added app/assets/images/pixelbomb.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions app/assets/stylesheets/_icons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,18 @@
font-style: normal;
}

.linkedin::before {
content: '\f0e1';
font-family: 'FontAwesome';
font-style: normal;
}

.linkedin::before {
Copy link
Copy Markdown

@houndci-bot houndci-bot Jun 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge rule .linkedin::before with rule on line 44

content: '\f0e1';
font-family: 'FontAwesome';
font-style: normal;
}

.map::before {
content: '\f041';
font-family: 'FontAwesome';
Expand Down
2 changes: 2 additions & 0 deletions app/assets/stylesheets/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,11 @@ $xxl-font-size: 3.75rem;
$base-line-height: 1.5rem;

// SIZING
$xsm-space: 0.2rem;
$little-space: 0.5rem;
$med-space: 1rem;
$large-space: 2rem;
$larger-space: 2.6rem;
$xl-space: 4rem;
$xxl-space: 6rem;
$xxxl-space: 8rem;
Expand Down
13 changes: 7 additions & 6 deletions app/assets/stylesheets/layout/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ footer {
width: 100%;

@include above($small-screen) {
text-align: center;
text-align: left;
}

li {
Expand All @@ -73,7 +73,7 @@ footer {
}

.contact,
.social,
/* .social, // social icons in centre */
nav {
flex: 1;
}
Expand All @@ -93,11 +93,12 @@ footer {
}

.social_icons {
padding-top: 15px;
padding-top: 20px;
Copy link
Copy Markdown

@houndci-bot houndci-bot Jun 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Properties should be ordered font-size, letter-spacing, padding-top

font-size: $large-font-size;
letter-spacing: $xsm-space;

img {
max-width: 35px;
padding-right: 10px;
@include above($medium-screen) {
display: none;
}
}
}
1 change: 0 additions & 1 deletion app/assets/stylesheets/layout/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ header {

.featured {
border-radius: $round-border;
/* padding-top: $little-space; */ /* take out*/
font-size: inherit;
}
}
Expand Down
61 changes: 28 additions & 33 deletions app/assets/stylesheets/pages/_home.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,54 +20,51 @@
}

p {
line-height: $base-line-height;
padding-bottom: 60px;
line-height: $base-line-height;
Copy link
Copy Markdown

@houndci-bot houndci-bot Jun 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line should be indented 4 spaces, but was indented 2 spaces

padding-bottom: 60px;
Copy link
Copy Markdown

@houndci-bot houndci-bot Jun 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line should be indented 4 spaces, but was indented 2 spaces

}

/* social icons */
Copy link
Copy Markdown

@houndci-bot houndci-bot Jun 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use // comments everywhere

@include above($medium-screen) {
#social_side_links {
list-style: none;
padding: 60;

#social_side_links
Copy link
Copy Markdown

@houndci-bot houndci-bot Jun 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Avoid using id selectors
Selector social_side_links should be written in lowercase with hyphens
Line contains trailing whitespace

{
Copy link
Copy Markdown

@houndci-bot houndci-bot Jun 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opening curly brace { should be preceded by one space

font-size: $med-font-size;
Copy link
Copy Markdown

@houndci-bot houndci-bot Jun 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Properties should be ordered background, border-radius, font-size, line-height, padding, position, right, text-align, top, z-index

position: fixed;
right: 20px;
top: 100px;
right: 30px;
z-index: 99;
padding: 12px;
background: $grey;
border-radius: $round-border;
text-align: center;
line-height: $larger-space;
}

#social_side_links li a {
display: block;
}

#social_side_links li a img {
background-color: $grey;
border-radius: 0;
display: block;
max-width: 45px;
padding: 10px;
transition: background .2s ease-in-out;
}

#social_side_links li a:hover img {
background: rgba(0, 0, 0, .9);
}
#social_side_links a {color: $white;}
Copy link
Copy Markdown

@houndci-bot houndci-bot Jun 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Avoid using id selectors
Line should be indented 4 spaces, but was indented 3 spaces
Selector social_side_links should be written in lowercase with hyphens

}

@include on($medium-screen) {
#social_side_links {

Copy link
Copy Markdown

@houndci-bot houndci-bot Jun 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line contains trailing whitespace

#social_side_links
Copy link
Copy Markdown

@houndci-bot houndci-bot Jun 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Avoid using id selectors
Selector social_side_links should be written in lowercase with hyphens
Line contains trailing whitespace

{
Copy link
Copy Markdown

@houndci-bot houndci-bot Jun 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opening curly brace { should be preceded by one space

display: none;
}
}

/* end social icons */

section {
padding-top: $med-space;
padding-left: $med-space;
padding-right: $med-space;

padding-bottom: $xxxl-space;
padding-left: $med-space;
padding-right: xxl-space;
padding-top: $med-space;
Copy link
Copy Markdown

@houndci-bot houndci-bot Jun 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line contains trailing whitespace

text-align: left;
}
}

.photos {
Copy link
Copy Markdown

@houndci-bot houndci-bot Jun 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line should be indented 2 spaces, but was indented 4 spaces

@include squairy-light-background;
}

.photos {
@include squairy-light-background;
Expand Down Expand Up @@ -142,7 +139,8 @@
padding-right: $xxl-space;
font-weight: bold;
letter-spacing: 2px;
text-shadow: 2px 2px 4px #000000;
padding-right: $xxl-space;
Copy link
Copy Markdown

@houndci-bot houndci-bot Jun 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Property padding-right already defined on line 139

text-shadow: 2px 2px 4px $grey;

@include above($small-screen) {
font-size: $xxl-font-size;
Expand All @@ -154,15 +152,11 @@
h2 {
font-size: $base-line-height;
padding-right: $xxl-space;

@include above($medium-screen) {
}
}
}

#events {
@include above($small-screen) {

background: transparent;

h2 {
Expand Down Expand Up @@ -252,6 +246,7 @@
font-size: $normal-font-size;
}


.apply-to-demo {
background-color: $background-color;
border-radius: $base-border-radius;
Expand Down
14 changes: 8 additions & 6 deletions app/views/layouts/_footer.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<%= mail_to t('.email'), t('.email') %>
</li>
</ul>

<%= render 'layouts/social' %>
<!-- <%= render 'layouts/social' %> -->

<nav>
<div class='languages'>
Expand All @@ -35,10 +35,12 @@
</div>

<div class='social_icons'>
<a href="https://www.facebook.com/mtlnewtech/" target="_blank"><%= image_tag 'facebook', alt: 'facebook' %></a>
<a href="https://twitter.com/mtlnewtech/" target="_blank"><%= image_tag 'twitter', alt: 'twitter' %></a>
<a href="https://www.linkedin.com/company-beta/9318526/" target="_blank"><%= image_tag 'linkedin', alt: 'linkedin' %></a>
<a href="https://www.instagram.com/mtlnewtech/" target="_blank"><%= image_tag 'instagram', alt: 'instagram' %></a></div>
<a href='https://www.facebook.com/mtlnewtech/' target='_blank' class='facebook'></a>
<a href='https://twitter.com/mtlnewtech/' target='_blank' class='twitter'></a>
<a href='https://www.linkedin.com/company-beta/9318526/' target='_blank' class='linkedin'></a>
<a href='https://www.instagram.com/mtlnewtech/' target='_blank' class='instagram'></a>
<a href='https://medium.com/@mtlnewtech/' target='_blank' class='medium'></a>
</div>

<div class='bottom'>
<p><%= t('.made_in_mtl_html', heart: '<i class="heart"></i>'.html_safe) %></p>
Expand Down
19 changes: 8 additions & 11 deletions app/views/pages/home.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
<%= provide :title, t('.title') %>

<!-- Social Icons Start -->

<ul id="social_side_links">
<li><a href="https://www.facebook.com/mtlnewtech/" target="_blank"><%= image_tag 'facebook', alt: 'facebook' %></a></li>
<li><a href="https://twitter.com/mtlnewtech/" target="_blank"><%= image_tag 'twitter', alt: 'twitter' %></a></li>
<li><a href="https://www.linkedin.com/company-beta/9318526/" target="_blank"><%= image_tag 'linkedin', alt: 'linkedin' %></a></li>
<li><a href="https://www.instagram.com/mtlnewtech/" target="_blank"><%= image_tag 'instagram', alt: 'instagram' %></a></li>
</ul>

<!-- Social Icons End -->
<div id="social_side_links">
<a href='https://www.facebook.com/mtlnewtech/' target='_blank' class='facebook'></a><br>
<a href='https://twitter.com/mtlnewtech/' target='_blank' class='twitter'></a><br>
<a href='https://www.linkedin.com/company-beta/9318526/' target='_blank' class='linkedin'></a><br>
<a href='https://www.instagram.com/mtlnewtech/' target='_blank' class='instagram'></a><br>
<a href='https://medium.com/@mtlnewtech/' target='_blank' class='medium'></a>
</div>

<section id='mtlnewtech'>

<div class='headers'>
<h1><%= t('.mtlnewtech.main') %></h1>
<h2><%= t('.mtlnewtech.sub') %></h2>
Expand Down Expand Up @@ -74,6 +70,7 @@
</div>

<section id='what_we_do'>

<div class='content'>
<h1><%= t('.what_we_do') %></h1>
<p><%= t('pages.about.about_us') %></p>
Expand Down
51 changes: 50 additions & 1 deletion db/schema.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,28 @@
t.index ["user_id"], name: "index_accounts_on_user_id", using: :btree
end

create_table "contacts", force: :cascade do |t|
t.string "email", null: false
t.string "name"
t.inet "remote_ip"
t.integer "source"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end

create_table "events", force: :cascade do |t|
t.string "name", null: false
t.text "description", null: false
t.datetime "starts_at", null: false
t.integer "duration"
t.integer "location_id"
t.string "cover_image"
t.string "slug"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["location_id"], name: "index_events_on_location_id", using: :btree
end

create_table "initiative_translations", force: :cascade do |t|
t.integer "initiative_id", null: false
t.string "locale", null: false
Expand All @@ -40,6 +62,14 @@
t.datetime "updated_at", null: false
end

create_table "locations", force: :cascade do |t|
t.string "name", null: false
t.string "address", null: false
t.text "directions"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end

create_table "member_profile_translations", force: :cascade do |t|
t.integer "member_profile_id", null: false
t.string "locale", null: false
Expand All @@ -54,14 +84,22 @@
create_table "member_profiles", force: :cascade do |t|
t.integer "user_id"
t.integer "team_id", null: false
t.string "name", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "image"
t.string "name", null: false
t.index ["team_id"], name: "index_member_profiles_on_team_id", using: :btree
t.index ["user_id"], name: "index_member_profiles_on_user_id", using: :btree
end

create_table "organizations", force: :cascade do |t|
t.string "name", null: false
t.text "description"
t.string "logo"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end

create_table "partnership_translations", force: :cascade do |t|
t.integer "partnership_id", null: false
t.string "locale", null: false
Expand All @@ -80,6 +118,16 @@
t.string "relationship", default: "community_partner", null: false
end

create_table "team_members", force: :cascade do |t|
t.integer "user_id"
t.text "bio"
t.string "position"
t.string "slug"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["user_id"], name: "index_team_members_on_user_id", using: :btree
end

create_table "team_translations", force: :cascade do |t|
t.integer "team_id", null: false
t.string "locale", null: false
Expand Down Expand Up @@ -114,6 +162,7 @@
end

add_foreign_key "accounts", "users"
add_foreign_key "events", "locations"
add_foreign_key "member_profiles", "teams"
add_foreign_key "member_profiles", "users"
end