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
6a52dead
Commit
6a52dead
authored
Mar 17, 2015
by
Randall Leeds
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small adder style fixes and dead code removal
parent
7f7bb94f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
77 deletions
+9
-77
base.scss
h/static/styles/base.scss
+0
-67
inject.scss
h/static/styles/inject.scss
+9
-10
No files found.
h/static/styles/base.scss
View file @
6a52dead
...
@@ -15,73 +15,6 @@
...
@@ -15,73 +15,6 @@
@include
box-shadow
(
$a
$b
1px
hsla
(
0
,
0%
,
0%
,
$c
));
@include
box-shadow
(
$a
$b
1px
hsla
(
0
,
0%
,
0%
,
$c
));
}
}
@mixin
plainform
{
color
:
$gray
;
background-color
:
white
;
border
:
1px
solid
$gray-lighter
;
border-radius
:
.2em
;
font-family
:
$sans-font-family
;
font-weight
:
300
;
font-size
:
1em
;
padding
:
.33em
.5em
;
&
:focus
,
&
.js-focus
{
outline
:
0
;
border
:
1px
solid
$gray
;
@include
box-shadow
(
inset
1px
1px
6px
-1px
$gray-lighter
);
}
&
:disabled
{
background-color
:
$gray-lightest
;
}
&
.ng-dirty.ng-invalid
{
border
:
1px
solid
$error-red-light
;
}
}
@mixin
sweetbutton
{
@include
background-image
(
linear-gradient
(
top
,
rgb
(
255
,
255
,
255
)
0%
,
rgb
(
255
,
255
,
255
)
10%
,
rgb
(
240
,
240
,
240
)
100%
));
@include
box-shadow
(
inset
0
.2em
0
rgba
(
255
,
255
,
255
,
.2
)
,
0
.05em
.1em
rgba
(
0
,
0
,
0
,
.08
));
@include
plainform
;
cursor
:
pointer
;
display
:
inline-block
;
padding
:
.4em
.9em
.5em
;
position
:
relative
;
text-decoration
:
none
;
text-shadow
:
0
1px
2px
rgba
(
255
,
255
,
255
,
.9
);
color
:
$gray-dark
;
border-color
:
$gray-light
$gray-light
$gray
;
border-radius
:
.15em
;
&
:hover
,
&
:focus
,
&
:active
,
&
.js-focus
,
&
.js-hover
,
&
.js-active
{
@include
background-image
(
linear-gradient
(
top
,
#fefefe
0%
,
#f4f4f4
50%
,
#e2e2e2
51%
,
#fdfdfd
100%
));
color
:
black
;
&
>
a
{
opacity
:
1
;
color
:
black
;
}
}
&
:active:not
([
disabled
]),
&
.js-active
{
@include
background-image
(
linear-gradient
(
top
,
#fcfcfc
0%
,
#f3f3f3
50%
,
#e1e1e1
51%
,
#fbfbfb
100%
));
@include
box-shadow
(
inset
0
.15em
.25em
rgba
(
0
,
0
,
0
,
.15
)
,
0
.05em
.1em
rgba
(
0
,
0
,
0
,
.0
));
border-color
:
$gray-light
$gray-light
$gray
;
top
:
1px
;
}
&
:disabled
{
color
:
$gray-light
;
border-color
:
$gray-lighter
;
background
:
$gray-lightest
;
cursor
:
default
;
}
}
@mixin
quote
{
@mixin
quote
{
color
:
$gray
;
color
:
$gray
;
font-family
:
$serif-font-family
;
font-family
:
$serif-font-family
;
...
...
h/static/styles/inject.scss
View file @
6a52dead
...
@@ -8,8 +8,6 @@ $base-font-size: 14px;
...
@@ -8,8 +8,6 @@ $base-font-size: 14px;
//ADDER////////////////////////////////
//ADDER////////////////////////////////
.annotator-adder
{
.annotator-adder
{
$border
:
$gray
;
$border-hover
:
$gray-dark
;
@include
box-sizing
(
border-box
);
@include
box-sizing
(
border-box
);
direction
:
ltr
;
direction
:
ltr
;
height
:
35px
;
height
:
35px
;
...
@@ -26,8 +24,8 @@ $base-font-size: 14px;
...
@@ -26,8 +24,8 @@ $base-font-size: 14px;
@include
rotate
(
45deg
);
@include
rotate
(
45deg
);
background
:
$white
;
background
:
$white
;
bottom
:
-8px
;
bottom
:
-8px
;
border-bottom
:
4px
solid
$
border
;
border-bottom
:
4px
solid
$
gray
;
border-right
:
4px
solid
$
border
;
border-right
:
4px
solid
$
gray
;
content
:
""
;
content
:
""
;
display
:
block
;
display
:
block
;
height
:
6px
;
height
:
6px
;
...
@@ -40,7 +38,7 @@ $base-font-size: 14px;
...
@@ -40,7 +38,7 @@ $base-font-size: 14px;
}
}
button
{
button
{
@include
sweetbutton
;
@include
box-shadow
(
none
)
;
font-family
:
h
;
font-family
:
h
;
border
:
none
;
border
:
none
;
cursor
:
pointer
;
cursor
:
pointer
;
...
@@ -53,13 +51,14 @@ $base-font-size: 14px;
...
@@ -53,13 +51,14 @@ $base-font-size: 14px;
background
:
$white
!
important
;
background
:
$white
!
important
;
color
:
$gray-light
!
important
;
color
:
$gray-light
!
important
;
&
:
hover
{
&
:
active
{
color
:
$border-hover
!
important
;
@include
single-transition
(
background-color
,
.25s
)
;
}
background-color
:
$gray-light
!
important
;
}
}
&
:hover
,
&
:before:hover
{
&
:hover
{
border-color
:
$border-hover
;
color
:
$gray-dark
!
important
;
}
}
}
}
}
...
...
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