Commit 4ed9e5f5 authored by Annabel Dunstone's avatar Annabel Dunstone

Update font colors, font sizes, caret icon, avatar size

parent 003b36b4
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
&.s46 { width: 46px; height: 46px; margin-right: 15px; } &.s46 { width: 46px; height: 46px; margin-right: 15px; }
&.s48 { width: 48px; height: 48px; margin-right: 10px; } &.s48 { width: 48px; height: 48px; margin-right: 10px; }
&.s60 { width: 60px; height: 60px; margin-right: 12px; } &.s60 { width: 60px; height: 60px; margin-right: 12px; }
&.s70 { width: 70px; height: 70px; margin-right: 14px; }
&.s90 { width: 90px; height: 90px; margin-right: 15px; } &.s90 { width: 90px; height: 90px; margin-right: 15px; }
&.s110 { width: 110px; height: 110px; margin-right: 15px; } &.s110 { width: 110px; height: 110px; margin-right: 15px; }
&.s140 { width: 140px; height: 140px; margin-right: 20px; } &.s140 { width: 140px; height: 140px; margin-right: 20px; }
......
...@@ -158,6 +158,10 @@ ...@@ -158,6 +158,10 @@
padding: 24px 0; padding: 24px 0;
.group-info { .group-info {
.cover-title {
margin-top: 9px;
}
p { p {
margin-bottom: 0; margin-bottom: 0;
} }
...@@ -173,8 +177,12 @@ ...@@ -173,8 +177,12 @@
} }
.group-info { .group-info {
h1 { h1 {
display: inline; display: inline;
font-weight: normal;
font-size: 24px;
color: $gl-title-color;
} }
} }
} }
......
...@@ -203,7 +203,21 @@ ...@@ -203,7 +203,21 @@
.controls { .controls {
float: right; float: right;
padding: 12px 5px 0 0; padding: 7px 5px 0 0;
i {
color: $layout-link-gray;
}
.fa-rss,
.fa-cog {
font-size: 16px;
}
.fa-caret-down {
margin-left: 5px;
color: $gl-icon-color;
}
.dropdown { .dropdown {
margin-left: 7px; margin-left: 7px;
...@@ -234,15 +248,28 @@ ...@@ -234,15 +248,28 @@
li { li {
a {
padding-top: 10px;
}
a, i {
color: $layout-link-gray;
}
&.active {
a, i {
color: $black;
}
}
.badge { .badge {
color: $gl-icon-color; color: $gl-icon-color;
} }
} }
} }
} }
.page-with-layout-nav { .page-with-layout-nav {
margin-top: 56px; margin-top: 52px;
} }
...@@ -75,6 +75,7 @@ $settings-icon-size: 18px; ...@@ -75,6 +75,7 @@ $settings-icon-size: 18px;
$provider-btn-group-border: #e5e5e5; $provider-btn-group-border: #e5e5e5;
$provider-btn-not-active-color: #4688f1; $provider-btn-not-active-color: #4688f1;
$link-underline-blue: #4a8bee; $link-underline-blue: #4a8bee;
$layout-link-gray: #7e7c7c;
/* /*
* Color schema * Color schema
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.cover-block.groups-cover-block .cover-block.groups-cover-block
.container-fluid.container-limited .container-fluid.container-limited
= link_to group_icon(@group), target: '_blank' do = link_to group_icon(@group), target: '_blank' do
= image_tag group_icon(@group), class: "avatar group-avatar s90" = image_tag group_icon(@group), class: "avatar group-avatar s70"
.group-info .group-info
.cover-title .cover-title
%h1 %h1
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
%span.dropdown.group-settings-dropdown %span.dropdown.group-settings-dropdown
%a.dropdown-new.btn.btn-gray#group-settings-button{href: '#', 'data-toggle' => 'dropdown'} %a.dropdown-new.btn.btn-gray#group-settings-button{href: '#', 'data-toggle' => 'dropdown'}
= icon('cog') = icon('cog')
= icon('angle-down') = icon('caret-down')
%ul.dropdown-menu.dropdown-menu-align-right %ul.dropdown-menu.dropdown-menu-align-right
= nav_link(path: 'groups#projects') do = nav_link(path: 'groups#projects') do
= link_to projects_group_path(@group), title: 'Projects' do = link_to projects_group_path(@group), title: 'Projects' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment