Skip to content

Commit

Permalink
Merge pull request #3181 from weaveworks/3180-adjust-font-sizes
Browse files Browse the repository at this point in the history
Adjust font sizes
  • Loading branch information
fbarl authored May 21, 2018
2 parents 96c016d + 068327b commit a7c7f89
Showing 1 changed file with 19 additions and 12 deletions.
31 changes: 19 additions & 12 deletions client/app/styles/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -319,15 +319,15 @@ a {
margin: 0px 8px;

&-label {
font-size: $font-size-small;
font-size: $font-size-normal;
}

}

.topologies-sub {
&-item {
&-label {
font-size: $font-size-tiny;
font-size: $font-size-small;
}
}
}
Expand Down Expand Up @@ -713,6 +713,7 @@ a {
margin-left: 4px;

span {
text-transform: capitalize;
font-size: $font-size-normal;
margin-left: 0;
}
Expand Down Expand Up @@ -757,7 +758,7 @@ a {

&-relatives {
margin-top: 4px;
font-size: $font-size-large;
font-size: $font-size-normal;
color: $color-white;

&-link {
Expand Down Expand Up @@ -832,9 +833,9 @@ a {
margin: 16px 0;

&-header {
font-size: $font-size-small;
font-size: $font-size-normal;
color: $text-tertiary-color;
padding: 4px 0;
margin-bottom: 10px;
}
}
}
Expand Down Expand Up @@ -931,7 +932,7 @@ a {
color: $text-secondary-color;
padding: 0 0.5em 0 0;
white-space: nowrap;
font-size: $font-size-tiny;
font-size: $font-size-small;

&::after {
content: ':';
Expand Down Expand Up @@ -963,7 +964,7 @@ a {
color: $text-secondary-color;
padding: 0 0.5em 0 0;
white-space: nowrap;
font-size: $font-size-tiny;
font-size: $font-size-small;

&::after {
content: ':';
Expand Down Expand Up @@ -1003,7 +1004,7 @@ a {

&-header {
color: $text-tertiary-color;
font-size: $font-size-tiny;
font-size: $font-size-small;
text-align: right;
padding: 0;

Expand Down Expand Up @@ -1180,6 +1181,7 @@ a {
font-weight: bold;
padding-right: 20px;
text-align: right;
text-transform: capitalize;
}
}

Expand Down Expand Up @@ -1365,7 +1367,7 @@ a {

&-icon {
color: $text-tertiary-color;
font-size: $font-size-large;
font-size: $font-size-normal;
position: relative;
top: 1px;
}
Expand Down Expand Up @@ -1424,6 +1426,7 @@ a {
}

.topology-option, .metric-selector, .network-selector, .view-mode-selector, .time-control {
font-size: $font-size-normal;
color: $text-secondary-color;
margin-bottom: 6px;

Expand Down Expand Up @@ -1470,6 +1473,7 @@ a {
}

.metric-selector {
font-size: $font-size-small;
margin-top: 6px;
}

Expand Down Expand Up @@ -1528,10 +1532,13 @@ a {
margin-top: 5px;
text-align: right;
pointer-events: all;
font-size: $font-size-small;
}
}

.topology-option {
font-size: $font-size-small;

&-action {
&-selected {
cursor: default;
Expand Down Expand Up @@ -1593,7 +1600,7 @@ a {
bottom: 11px;
left: 11px;
padding: 5px;
font-size: $font-size-tiny;
font-size: $font-size-small;
border-radius: $border-radius-soft;
border: 1px solid transparent;
pointer-events: none;
Expand Down Expand Up @@ -1638,7 +1645,7 @@ a {
&-help-link {
@extend .btn-opacity;
cursor: pointer;
font-size: $font-size-large;
font-size: $font-size-normal;
}

&-label {
Expand All @@ -1656,7 +1663,7 @@ a {
}

&-hint {
font-size: $font-size-tiny;
font-size: $font-size-small;
transition: opacity 0.3s 0.5s $base-ease;
opacity: 1;
}
Expand Down

0 comments on commit a7c7f89

Please sign in to comment.