Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
coopwire-hypothesis
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
孙灵跃 Leon Sun
coopwire-hypothesis
Commits
286378cc
Commit
286378cc
authored
Jun 09, 2020
by
Lyza Danger Gardner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add `font-tiny`, `font-big` font mixins and use
parent
598cf22a
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
20 additions
and
11 deletions
+20
-11
autocomplete-list.scss
src/styles/sidebar/components/autocomplete-list.scss
+0
-1
group-list.scss
src/styles/sidebar/components/group-list.scss
+1
-2
help-panel.scss
src/styles/sidebar/components/help-panel.scss
+2
-2
menu.scss
src/styles/sidebar/components/menu.scss
+1
-1
selection-tabs.scss
src/styles/sidebar/components/selection-tabs.scss
+2
-2
top-bar.scss
src/styles/sidebar/components/top-bar.scss
+2
-3
variables.scss
src/styles/variables.scss
+12
-0
No files found.
src/styles/sidebar/components/autocomplete-list.scss
View file @
286378cc
...
@@ -39,7 +39,6 @@
...
@@ -39,7 +39,6 @@
z-index
:
10
;
z-index
:
10
;
@media
(
pointer
:
coarse
)
{
@media
(
pointer
:
coarse
)
{
font-size
:
var
.
$touch-target-size
;
line-height
:
var
.
$touch-target-size
;
line-height
:
var
.
$touch-target-size
;
}
}
}
}
...
...
src/styles/sidebar/components/group-list.scss
View file @
286378cc
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
}
}
.group-list__menu-label
{
.group-list__menu-label
{
@include
var
.
font-big
;
align-items
:
center
;
align-items
:
center
;
color
:
var
.
$color-text
;
color
:
var
.
$color-text
;
display
:
flex
;
display
:
flex
;
...
@@ -12,8 +13,6 @@
...
@@ -12,8 +13,6 @@
// Prevent label from wrapping if top bar is too narrow to fit all of its
// Prevent label from wrapping if top bar is too narrow to fit all of its
// items.
// items.
flex-shrink
:
0
;
flex-shrink
:
0
;
font-size
:
var
.
$body2-font-size
;
font-weight
:
bold
;
font-weight
:
bold
;
}
}
...
...
src/styles/sidebar/components/help-panel.scss
View file @
286378cc
...
@@ -3,9 +3,9 @@
...
@@ -3,9 +3,9 @@
.help-panel
{
.help-panel
{
&
__sub-panel-title
{
&
__sub-panel-title
{
@include
var
.
font-big
;
margin
:
0
;
margin
:
0
;
padding
:
0
.5em
0
;
padding
:
0
.5em
0
;
font-size
:
1
.25em
;
font-weight
:
500
;
font-weight
:
500
;
}
}
...
@@ -51,11 +51,11 @@
...
@@ -51,11 +51,11 @@
align-items
:
center
;
align-items
:
center
;
&
__tab
{
&
__tab
{
@include
var
.
font-big
;
flex
:
1
1
0px
;
flex
:
1
1
0px
;
margin-top
:
0
.5em
;
margin-top
:
0
.5em
;
border-right
:
1px
solid
var
.
$grey-3
;
border-right
:
1px
solid
var
.
$grey-3
;
text-align
:
center
;
text-align
:
center
;
font-size
:
1
.25em
;
color
:
var
.
$color-text-light
;
color
:
var
.
$color-text-light
;
&
:last-of-type
{
&
:last-of-type
{
...
...
src/styles/sidebar/components/menu.scss
View file @
286378cc
...
@@ -71,10 +71,10 @@
...
@@ -71,10 +71,10 @@
// Content area of the menu.
// Content area of the menu.
.menu__content
{
.menu__content
{
@include
var
.
font-big
;
background-color
:
white
;
background-color
:
white
;
border
:
1px
solid
var
.
$grey-3
;
border
:
1px
solid
var
.
$grey-3
;
box-shadow
:
var
.
$popup-menu-shadow
;
box-shadow
:
var
.
$popup-menu-shadow
;
font-size
:
var
.
$body2-font-size
;
position
:
absolute
;
position
:
absolute
;
top
:
calc
(
100%
+
5px
);
top
:
calc
(
100%
+
5px
);
z-index
:
1
;
z-index
:
1
;
...
...
src/styles/sidebar/components/selection-tabs.scss
View file @
286378cc
...
@@ -5,8 +5,8 @@
...
@@ -5,8 +5,8 @@
.selection-tabs
{
.selection-tabs
{
display
:
flex
;
display
:
flex
;
flex-direction
:
row
;
flex-direction
:
row
;
color
:
var
.
$color-text-light
;
@include
var
.
font-normal
;
@include
var
.
font-normal
;
color
:
var
.
$color-text-light
;
&
:hover
{
&
:hover
{
color
:
var
.
$color-text
;
color
:
var
.
$color-text
;
...
@@ -46,9 +46,9 @@
...
@@ -46,9 +46,9 @@
}
}
.selection-tabs__count
{
.selection-tabs__count
{
@include
var
.
font-tiny
;
position
:
relative
;
position
:
relative
;
bottom
:
3px
;
bottom
:
3px
;
font-size
:
10px
;
}
}
.selection-tabs__empty-message
{
.selection-tabs__empty-message
{
...
...
src/styles/sidebar/components/top-bar.scss
View file @
286378cc
...
@@ -3,12 +3,11 @@
...
@@ -3,12 +3,11 @@
@use
"../../variables"
as
var
;
@use
"../../variables"
as
var
;
.top-bar
{
.top-bar
{
@include
var
.
font-big
;
color
:
var
.
$grey-mid
;
color
:
var
.
$grey-mid
;
background
:
var
.
$white
;
background
:
var
.
$white
;
border-bottom
:
solid
1px
var
.
$grey-3
;
border-bottom
:
solid
1px
var
.
$grey-3
;
height
:
var
.
$top-bar-height
;
height
:
var
.
$top-bar-height
;
// TODO bring into standard rhythm of typography
font-size
:
15px
;
position
:
absolute
;
position
:
absolute
;
left
:
0
;
left
:
0
;
right
:
0
;
right
:
0
;
...
@@ -62,9 +61,9 @@
...
@@ -62,9 +61,9 @@
.top-bar__login-button
{
.top-bar__login-button
{
@include
buttons
.
button
;
@include
buttons
.
button
;
@include
var
.
font-big
;
padding
:
0
0
.25em
;
padding
:
0
0
.25em
;
color
:
var
.
$color-brand
;
color
:
var
.
$color-brand
;
font-size
:
var
.
$body2-font-size
;
&
:hover
{
&
:hover
{
color
:
var
.
$color-link-hover
;
color
:
var
.
$color-link-hover
;
...
...
src/styles/variables.scss
View file @
286378cc
...
@@ -120,6 +120,13 @@ $popup-menu-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
...
@@ -120,6 +120,13 @@ $popup-menu-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
// Mixins
// Mixins
// ------
// ------
@mixin
font-tiny
{
font-size
:
10px
;
line-height
:
$small-line-height
;
font-weight
:
400
;
}
@mixin
font-small
{
@mixin
font-small
{
font-size
:
$small-font-size
;
font-size
:
$small-font-size
;
line-height
:
$small-line-height
;
line-height
:
$small-line-height
;
...
@@ -131,3 +138,8 @@ $popup-menu-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
...
@@ -131,3 +138,8 @@ $popup-menu-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
line-height
:
$normal-line-height
;
line-height
:
$normal-line-height
;
font-weight
:
400
;
font-weight
:
400
;
}
}
@mixin
font-big
{
font-size
:
$body2-font-size
;
line-height
:
$base-line-height
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment