Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
2acb030b
Commit
2acb030b
authored
Oct 07, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor button css and do some cleanup
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
7ad4521f
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
75 additions
and
98 deletions
+75
-98
app/assets/stylesheets/base/gl_variables.scss
app/assets/stylesheets/base/gl_variables.scss
+2
-2
app/assets/stylesheets/base/layout.scss
app/assets/stylesheets/base/layout.scss
+1
-0
app/assets/stylesheets/generic/buttons.scss
app/assets/stylesheets/generic/buttons.scss
+60
-69
app/assets/stylesheets/generic/forms.scss
app/assets/stylesheets/generic/forms.scss
+2
-12
app/assets/stylesheets/generic/selects.scss
app/assets/stylesheets/generic/selects.scss
+5
-5
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+5
-10
No files found.
app/assets/stylesheets/base/gl_variables.scss
View file @
2acb030b
...
@@ -22,8 +22,8 @@ $brand-info: $gl-info;
...
@@ -22,8 +22,8 @@ $brand-info: $gl-info;
$brand-warning
:
$gl-warning
;
$brand-warning
:
$gl-warning
;
$brand-danger
:
$gl-danger
;
$brand-danger
:
$gl-danger
;
$border-radius-base
:
3
px
!
default
;
$border-radius-base
:
2
px
!
default
;
$border-radius-large
:
5
px
!
default
;
$border-radius-large
:
2
px
!
default
;
$border-radius-small
:
2px
!
default
;
$border-radius-small
:
2px
!
default
;
...
...
app/assets/stylesheets/base/layout.scss
View file @
2acb030b
...
@@ -5,6 +5,7 @@ html {
...
@@ -5,6 +5,7 @@ html {
body
{
body
{
padding-top
:
$header-height
;
padding-top
:
$header-height
;
text-rendering
:
geometricPrecision
;
}
}
}
}
...
...
app/assets/stylesheets/generic/buttons.scss
View file @
2acb030b
body
{
text-rendering
:
geometricPrecision
;
}
@mixin
btn-default
{
@mixin
btn-default
{
@include
border-radius
(
2px
);
@include
border-radius
(
2px
);
...
@@ -87,9 +83,7 @@ body {
...
@@ -87,9 +83,7 @@ body {
}
}
}
}
/*Butons*/
@mixin
btn-gray
{
@mixin
btn-project
{
background-color
:
#f0f2f5
;
background-color
:
#f0f2f5
;
border-color
:
#dce0e5
;
border-color
:
#dce0e5
;
color
:
#313236
;
color
:
#313236
;
...
@@ -115,7 +109,7 @@ body {
...
@@ -115,7 +109,7 @@ body {
}
}
}
}
@mixin
btn-
light
{
@mixin
btn-
white
{
background-color
:
#fff
;
background-color
:
#fff
;
border-color
:
#dce0e5
;
border-color
:
#dce0e5
;
color
:
#313236
;
color
:
#313236
;
...
@@ -141,7 +135,7 @@ body {
...
@@ -141,7 +135,7 @@ body {
}
}
}
}
@mixin
btn-re
move
{
@mixin
btn-re
d
{
background-color
:
#f72e60
;
background-color
:
#f72e60
;
border-color
:
#ee295a
;
border-color
:
#ee295a
;
...
@@ -160,23 +154,20 @@ body {
...
@@ -160,23 +154,20 @@ body {
background-color
:
#d42450
!
important
;
background-color
:
#d42450
!
important
;
border-color
:
#e12554
!
important
;
border-color
:
#e12554
!
important
;
}
}
}
}
.btn
-info
{
.btn
{
@include
btn-default
;
@include
btn-default
;
@include
btn-project
;
@include
btn-white
;
}
.btn-success
{
&
.btn-success
{
@include
btn-default
;
@include
btn-green
;
@include
btn-green
;
}
}
&
.btn-gray
{
@include
btn-gray
;
.btn
{
}
@include
btn-default
;
&
.btn-new
{
&
.btn-new
{
@extend
.btn-success
;
@extend
.btn-success
;
...
...
app/assets/stylesheets/generic/forms.scss
View file @
2acb030b
...
@@ -29,9 +29,6 @@ input[type='text'].danger {
...
@@ -29,9 +29,6 @@ input[type='text'].danger {
border-top
:
1px
solid
$border-color
;
border-top
:
1px
solid
$border-color
;
}
}
@media
(
min-width
:
$screen-sm-min
)
{
}
label
{
label
{
&
.control-label
{
&
.control-label
{
@extend
.col-sm-2
;
@extend
.col-sm-2
;
...
@@ -84,20 +81,13 @@ label {
...
@@ -84,20 +81,13 @@ label {
.form-group
.control-label
{
.form-group
.control-label
{
font-weight
:
normal
;
font-weight
:
normal
;
font-color
:
#313236
!
important
;
}
}
.form-control
{
.
form-control
:
:-
webkit-input-placeholder
{
@include
border-radius
(
2px
);
color
:
#7f8fa4
;
}
.
form-control
:
:-
webkit-input-placeholder
{
color
:
#7f8fa4
;
}
}
.input-group
{
.input-group
{
@include
border-radius
(
2px
);
.input-group-addon
{
.input-group-addon
{
background-color
:
#f7f8fa
;
background-color
:
#f7f8fa
;
}
}
...
...
app/assets/stylesheets/generic/selects.scss
View file @
2acb030b
...
@@ -27,12 +27,12 @@
...
@@ -27,12 +27,12 @@
@include
box-shadow
(
rgba
(
76
,
86
,
103
,
0
.247059
)
0px
0px
1px
0px
,
rgba
(
31
,
37
,
50
,
0
.317647
)
0px
2px
18px
0px
);
@include
box-shadow
(
rgba
(
76
,
86
,
103
,
0
.247059
)
0px
0px
1px
0px
,
rgba
(
31
,
37
,
50
,
0
.317647
)
0px
2px
18px
0px
);
@include
border-radius
(
0px
);
@include
border-radius
(
0px
);
padding
:
16px
20px
;
padding
:
16px
;
border
:
none
!
important
;
border
:
none
!
important
;
}
}
.select2-results
.select2-result-label
{
.select2-results
.select2-result-label
{
padding
:
16px
20px
;
padding
:
16px
;
}
}
.select2-drop
{
.select2-drop
{
...
@@ -142,5 +142,5 @@
...
@@ -142,5 +142,5 @@
}
}
.ajax-users-dropdown
{
.ajax-users-dropdown
{
min-width
:
2
25
px
!
important
;
min-width
:
2
50
px
!
important
;
}
}
app/assets/stylesheets/pages/projects.scss
View file @
2acb030b
...
@@ -18,10 +18,6 @@
...
@@ -18,10 +18,6 @@
}
}
}
}
.btn
,
.commits-compare-switch
{
@include
btn-light
;
}
.project-edit-content
{
.project-edit-content
{
padding
:
7px
;
padding
:
7px
;
}
}
...
@@ -100,8 +96,7 @@
...
@@ -100,8 +96,7 @@
margin-bottom
:
0px
;
margin-bottom
:
0px
;
.btn
{
.btn
{
@include
btn-project
;
@include
btn-gray
;
@include
btn-default
;
.count
{
.count
{
display
:
inline-block
;
display
:
inline-block
;
...
@@ -161,7 +156,7 @@
...
@@ -161,7 +156,7 @@
.input-group-btn
{
.input-group-btn
{
.btn
{
.btn
{
@include
btn-
project
;
@include
btn-
gray
;
@include
btn-middle
;
@include
btn-middle
;
&
:hover
{
&
:hover
{
...
@@ -195,7 +190,7 @@
...
@@ -195,7 +190,7 @@
margin
:
0
12px
0
12px
;
margin
:
0
12px
0
12px
;
.btn
{
.btn
{
@include
btn-
project
;
@include
btn-
gray
;
@include
btn-default
;
@include
btn-default
;
}
}
...
@@ -390,7 +385,7 @@ table.table.protected-branches-list tr.no-border {
...
@@ -390,7 +385,7 @@ table.table.protected-branches-list tr.no-border {
.nav
>
li
>
a
{
.nav
>
li
>
a
{
@include
btn-default
;
@include
btn-default
;
@include
btn-
project
;
@include
btn-
gray
;
background-color
:
transparent
;
background-color
:
transparent
;
border
:
1px
solid
#f7f8fa
;
border
:
1px
solid
#f7f8fa
;
...
@@ -450,7 +445,7 @@ pre.light-well {
...
@@ -450,7 +445,7 @@ pre.light-well {
.btn-remove
{
.btn-remove
{
@include
btn-middle
;
@include
btn-middle
;
@include
btn-re
move
;
@include
btn-re
d
;
float
:
left
!
important
;
float
:
left
!
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