Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
2acb030b
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
2acb030b
编写于
10月 07, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactor button css and do some cleanup
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
7ad4521f
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
75 addition
and
98 deletion
+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
未找到文件。
app/assets/stylesheets/base/gl_variables.scss
浏览文件 @
2acb030b
...
...
@@ -22,8 +22,8 @@ $brand-info: $gl-info;
$brand-warning
:
$gl-warning
;
$brand-danger
:
$gl-danger
;
$border-radius-base
:
3
px
!
default
;
$border-radius-large
:
5
px
!
default
;
$border-radius-base
:
2
px
!
default
;
$border-radius-large
:
2
px
!
default
;
$border-radius-small
:
2px
!
default
;
...
...
app/assets/stylesheets/base/layout.scss
浏览文件 @
2acb030b
...
...
@@ -5,6 +5,7 @@ html {
body
{
padding-top
:
$header-height
;
text-rendering
:
geometricPrecision
;
}
}
...
...
app/assets/stylesheets/generic/buttons.scss
浏览文件 @
2acb030b
body
{
text-rendering
:
geometricPrecision
;
}
@mixin
btn-default
{
@include
border-radius
(
2px
);
border-width
:
1px
;
border-style
:
solid
;
text-transform
:
uppercase
;
...
...
@@ -13,17 +9,17 @@ body {
line-height
:
18px
;
padding
:
11px
16px
;
letter-spacing
:
.4px
;
&
:hover
{
border-width
:
1px
;
border-style
:
solid
;
}
&
:focus
{
border-width
:
1px
;
border-style
:
solid
;
}
&
:active
{
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
));
border-width
:
1px
;
...
...
@@ -33,7 +29,7 @@ body {
@mixin
btn-middle
{
@include
border-radius
(
2px
);
border-width
:
1px
;
border-style
:
solid
;
text-transform
:
uppercase
;
...
...
@@ -42,22 +38,22 @@ body {
line-height
:
18px
;
padding
:
11px
24px
;
letter-spacing
:
.4px
;
&
:hover
{
border-width
:
1px
;
border-style
:
solid
;
}
&
:focus
{
border-width
:
1px
;
border-style
:
solid
;
}
&
:active
{
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
));
border-width
:
1px
;
border-style
:
solid
;
}
}
}
...
...
@@ -65,118 +61,113 @@ body {
background-color
:
#28b061
;
border
:
1px
solid
#26a65c
;
color
:
#fff
;
&
:hover
{
background-color
:
#26ab5d
;
border
:
1px
solid
#229954
;
color
:
#fff
;
}
&
:focus
{
background-color
:
#26ab5d
;
border
:
1px
solid
#229954
;
color
:
#fff
;
}
&
:active
{
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
));
background-color
:
#23a158
!
important
;
border
:
1px
solid
#229954
!
important
;
color
:
#fff
!
important
;
}
}
/*Butons*/
&
:hover
{
background-color
:
#26ab5d
;
border
:
1px
solid
#229954
;
color
:
#fff
;
}
&
:focus
{
background-color
:
#26ab5d
;
border
:
1px
solid
#229954
;
color
:
#fff
;
}
&
:active
{
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
));
background-color
:
#23a158
!
important
;
border
:
1px
solid
#229954
!
important
;
color
:
#fff
!
important
;
}
}
@mixin
btn-
project
{
@mixin
btn-
gray
{
background-color
:
#f0f2f5
;
border-color
:
#dce0e5
;
color
:
#313236
;
&
:hover
{
border-color
:
#dce0e5
;
background-color
:
#ebeef2
;
color
:
#313236
;
}
&
:focus
{
border-color
:
#dce0e5
;
background-color
:
#ebeef2
;
color
:
#313236
;
}
&
:active
{
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
));
color
:
#313236
!
important
;
border-color
:
#c6cacf
!
important
;
background-color
:
#e4e7ed
!
important
;
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
));
color
:
#313236
!
important
;
border-color
:
#c6cacf
!
important
;
background-color
:
#e4e7ed
!
important
;
}
}
@mixin
btn-
light
{
@mixin
btn-
white
{
background-color
:
#fff
;
border-color
:
#dce0e5
;
color
:
#313236
;
&
:hover
{
border-color
:
#dce0e5
;
background-color
:
#f0f2f5
;
color
:
#313236
;
}
&
:focus
{
border-color
:
#dce0e5
;
background-color
:
#f0f2f5
;
color
:
#313236
;
}
&
:active
{
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
));
color
:
#313236
!
important
;
border-color
:
#c6cacf
!
important
;
background-color
:
#e4e7ed
!
important
;
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
));
color
:
#313236
!
important
;
border-color
:
#c6cacf
!
important
;
background-color
:
#e4e7ed
!
important
;
}
}
@mixin
btn-re
move
{
@mixin
btn-re
d
{
background-color
:
#f72e60
;
border-color
:
#ee295a
;
&
:hover
{
background-color
:
#e82757
;
border-color
:
#e32555
;
}
&
:focus
{
background-color
:
#e82757
;
border-color
:
#e32555
;
}
&
:active
{
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
));
background-color
:
#d42450
!
important
;
border-color
:
#e12554
!
important
;
}
}
.btn
-info
{
.btn
{
@include
btn-default
;
@include
btn-project
;
}
@include
btn-white
;
.btn-success
{
@include
btn-default
;
@include
btn-green
;
}
&
.btn-success
{
@include
btn-green
;
}
.btn
{
@include
btn-default
;
&
.btn-gray
{
@include
btn-gray
;
}
&
.btn-new
{
@extend
.btn-success
;
...
...
@@ -264,4 +255,4 @@ body {
color
:
#fff
;
}
}
}
\ No newline at end of file
}
app/assets/stylesheets/generic/forms.scss
浏览文件 @
2acb030b
...
...
@@ -29,9 +29,6 @@ input[type='text'].danger {
border-top
:
1px
solid
$border-color
;
}
@media
(
min-width
:
$screen-sm-min
)
{
}
label
{
&
.control-label
{
@extend
.col-sm-2
;
...
...
@@ -84,20 +81,13 @@ label {
.form-group
.control-label
{
font-weight
:
normal
;
font-color
:
#313236
!
important
;
}
.form-control
{
@include
border-radius
(
2px
);
}
.
form-control
:
:-
webkit-input-placeholder
{
color
:
#7f8fa4
;
.
form-control
:
:-
webkit-input-placeholder
{
color
:
#7f8fa4
;
}
.input-group
{
@include
border-radius
(
2px
);
.input-group-addon
{
background-color
:
#f7f8fa
;
}
...
...
app/assets/stylesheets/generic/selects.scss
浏览文件 @
2acb030b
...
...
@@ -26,13 +26,13 @@
.select2-drop
{
@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
);
padding
:
16px
20px
;
padding
:
16px
;
border
:
none
!
important
;
}
.select2-results
.select2-result-label
{
padding
:
16px
20px
;
padding
:
16px
;
}
.select2-drop
{
...
...
@@ -142,5 +142,5 @@
}
.ajax-users-dropdown
{
min-width
:
225px
!
important
;
}
\ No newline at end of file
min-width
:
250px
!
important
;
}
app/assets/stylesheets/pages/projects.scss
浏览文件 @
2acb030b
...
...
@@ -18,10 +18,6 @@
}
}
.btn
,
.commits-compare-switch
{
@include
btn-light
;
}
.project-edit-content
{
padding
:
7px
;
}
...
...
@@ -100,8 +96,7 @@
margin-bottom
:
0px
;
.btn
{
@include
btn-project
;
@include
btn-default
;
@include
btn-gray
;
.count
{
display
:
inline-block
;
...
...
@@ -161,7 +156,7 @@
.input-group-btn
{
.btn
{
@include
btn-
project
;
@include
btn-
gray
;
@include
btn-middle
;
&
:hover
{
...
...
@@ -195,7 +190,7 @@
margin
:
0
12px
0
12px
;
.btn
{
@include
btn-
project
;
@include
btn-
gray
;
@include
btn-default
;
}
...
...
@@ -390,7 +385,7 @@ table.table.protected-branches-list tr.no-border {
.nav
>
li
>
a
{
@include
btn-default
;
@include
btn-
project
;
@include
btn-
gray
;
background-color
:
transparent
;
border
:
1px
solid
#f7f8fa
;
...
...
@@ -450,7 +445,7 @@ pre.light-well {
.btn-remove
{
@include
btn-middle
;
@include
btn-re
move
;
@include
btn-re
d
;
float
:
left
!
important
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录