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
e73d1a82
Unverified
Commit
e73d1a82
authored
Nov 19, 2019
by
Lyza Gardner
Committed by
GitHub
Nov 19, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1510 from hypothesis/remove-unused-styles
Remove (some) deprecated SCSS color variables
parents
d9abd85d
613e92f7
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
19 deletions
+8
-19
forms.scss
src/styles/forms.scss
+0
-8
forms.scss
src/styles/mixins/forms.scss
+1
-1
annotation-publish-control.scss
...styles/sidebar/components/annotation-publish-control.scss
+6
-3
primary-action-btn.scss
src/styles/sidebar/components/primary-action-btn.scss
+1
-1
variables.scss
src/styles/variables.scss
+0
-6
No files found.
src/styles/forms.scss
View file @
e73d1a82
...
@@ -201,14 +201,6 @@
...
@@ -201,14 +201,6 @@
padding
:
2px
;
padding
:
2px
;
}
}
// a light grey cancel/remove button which darkens on hover
.btn--cancel
{
color
:
$color-silver
;
&
:hover
{
color
:
darken
(
$color-silver
,
15%
);
}
}
// Handles state transitions from "default" -> "loading" -> "success"
// Handles state transitions from "default" -> "loading" -> "success"
[
status-button-state
]
.btn-message
{
[
status-button-state
]
.btn-message
{
top
:
-999em
;
top
:
-999em
;
...
...
src/styles/mixins/forms.scss
View file @
e73d1a82
...
@@ -82,7 +82,7 @@
...
@@ -82,7 +82,7 @@
}
}
@mixin
primary-action-btn
{
@mixin
primary-action-btn
{
color
:
$
color-seashell
;
color
:
$
grey-1
;
background-color
:
$color-dove-gray
;
background-color
:
$color-dove-gray
;
height
:
35px
;
height
:
35px
;
border
:
none
;
border
:
none
;
...
...
src/styles/sidebar/components/annotation-publish-control.scss
View file @
e73d1a82
...
@@ -2,10 +2,13 @@
...
@@ -2,10 +2,13 @@
display
:
flex
;
display
:
flex
;
&
__cancel-btn
{
&
__cancel-btn
{
@extend
.btn--cancel
;
margin-left
:
5px
;
margin-left
:
5px
;
font-weight
:
normal
;
font-weight
:
normal
;
color
:
$grey-4
;
&
:hover
{
color
:
$grey-5
;
}
&
__icon
{
&
__icon
{
margin-right
:
3px
;
margin-right
:
3px
;
...
@@ -16,7 +19,7 @@
...
@@ -16,7 +19,7 @@
// A split button with a primary submit on the left and a drop-down menu
// A split button with a primary submit on the left and a drop-down menu
// of related options to the right
// of related options to the right
.annotation-publish-control__btn
{
.annotation-publish-control__btn
{
$text-color
:
$
color-seashell
;
$text-color
:
$
grey-1
;
$default-background-color
:
$color-dove-gray
;
$default-background-color
:
$color-dove-gray
;
$hover-background-color
:
$color-mine-shaft
;
$hover-background-color
:
$color-mine-shaft
;
$h-padding
:
9px
;
$h-padding
:
9px
;
...
...
src/styles/sidebar/components/primary-action-btn.scss
View file @
e73d1a82
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
}
}
.primary-action-btn__icon
{
.primary-action-btn__icon
{
color
:
$
color-silver-chalice
;
color
:
$
grey-4
;
display
:
inline-block
;
display
:
inline-block
;
font-weight
:
bold
;
font-weight
:
bold
;
margin-left
:
-3px
;
margin-left
:
-3px
;
...
...
src/styles/variables.scss
View file @
e73d1a82
...
@@ -10,18 +10,12 @@ $gray: #777 !default;
...
@@ -10,18 +10,12 @@ $gray: #777 !default;
$gray-dark
:
#585858
;
$gray-dark
:
#585858
;
$gray-light
:
#969696
!
default
;
$gray-light
:
#969696
!
default
;
$gray-lighter
:
#d3d3d3
!
default
;
$gray-lighter
:
#d3d3d3
!
default
;
$gray-lightest
:
#f9f9f9
!
default
;
$color-mine-shaft
:
#3a3a3a
;
$color-mine-shaft
:
#3a3a3a
;
$color-dove-gray
:
#626262
;
$color-dove-gray
:
#626262
;
$color-gray
:
#818181
;
$color-gray
:
#818181
;
$color-silver-chalice
:
#a6a6a6
;
$color-silver
:
#bbb
;
$color-seashell
:
#f1f1f1
;
// Colors
// Colors
// ---------------------
// ---------------------
$color-cardinal
:
#bd1c2b
;
$brand-color
:
#bd1c2b
!
default
;
$brand-color
:
#bd1c2b
!
default
;
$button-text-color
:
$gray-dark
!
default
;
$button-text-color
:
$gray-dark
!
default
;
...
...
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