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
ab68fd22
Commit
ab68fd22
authored
Oct 08, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restyle colorful panel boxes
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
b485fdb5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
33 additions
and
40 deletions
+33
-40
app/assets/stylesheets/generic/issue_box.scss
app/assets/stylesheets/generic/issue_box.scss
+1
-1
app/assets/stylesheets/gl_bootstrap.scss
app/assets/stylesheets/gl_bootstrap.scss
+10
-30
app/assets/stylesheets/main/mixins.scss
app/assets/stylesheets/main/mixins.scss
+11
-0
app/assets/stylesheets/main/variables.scss
app/assets/stylesheets/main/variables.scss
+1
-0
app/assets/stylesheets/sections/merge_requests.scss
app/assets/stylesheets/sections/merge_requests.scss
+1
-1
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+9
-8
No files found.
app/assets/stylesheets/generic/issue_box.scss
View file @
ab68fd22
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
.issue-box
{
.issue-box
{
color
:
#555
;
color
:
#555
;
margin
:
20px
0
;
margin
:
20px
0
;
background
:
#f9f9f9
;
background
:
$box_bg
;
border-top-left-radius
:
5px
;
border-top-left-radius
:
5px
;
@include
box-shadow
(
0
1px
1px
rgba
(
0
,
0
,
0
,
0
.09
));
@include
box-shadow
(
0
1px
1px
rgba
(
0
,
0
,
0
,
0
.09
));
...
...
app/assets/stylesheets/gl_bootstrap.scss
View file @
ab68fd22
...
@@ -233,8 +233,8 @@ $list-group-active-bg: $bg_primary;
...
@@ -233,8 +233,8 @@ $list-group-active-bg: $bg_primary;
}
}
.form-actions
{
.form-actions
{
margin
-bottom
:
0
;
margin
:
-15px
;
background
:
#FFF
;
margin-top
:
18px
;
}
}
}
}
...
@@ -262,53 +262,33 @@ $list-group-active-bg: $bg_primary;
...
@@ -262,53 +262,33 @@ $list-group-active-bg: $bg_primary;
}
}
.panel-danger
{
.panel-danger
{
border-color
:
$border_danger
;
@include
panel-colored
;
.panel-heading
{
.panel-heading
{
color
:
#ffffff
;
color
:
$border_danger
;
background-color
:
$bg_danger
;
border-color
:
$border_danger
;
border-color
:
$border_danger
;
a
{
color
:
#FFF
;
text-decoration
:
underline
;
}
}
}
}
}
.panel-success
{
.panel-success
{
border-color
:
$border_success
;
@include
panel-colored
;
.panel-heading
{
.panel-heading
{
color
:
#ffffff
;
color
:
$border_success
;
background-color
:
$bg_success
;
border-color
:
$border_success
;
border-color
:
$border_success
;
a
{
color
:
#FFF
;
text-decoration
:
underline
;
}
}
}
}
}
.panel-primary
{
.panel-primary
{
border-color
:
$border_primary
;
@include
panel-colored
;
.panel-heading
{
.panel-heading
{
color
:
#ffffff
;
color
:
$border_primary
;
background-color
:
$bg_primary
;
border-color
:
$border_primary
;
border-color
:
$border_primary
;
a
{
color
:
#FFF
;
text-decoration
:
underline
;
}
}
}
}
}
.panel-warning
{
.panel-warning
{
border-color
:
$border_warning
;
@include
panel-colored
;
.panel-heading
{
.panel-heading
{
color
:
#ffffff
;
color
:
$border_warning
;
background-color
:
$bg_warning
;
border-color
:
$border_warning
;
border-color
:
$border_warning
;
a
{
color
:
#FFF
;
text-decoration
:
underline
;
}
}
}
}
}
app/assets/stylesheets/main/mixins.scss
View file @
ab68fd22
...
@@ -132,3 +132,14 @@
...
@@ -132,3 +132,14 @@
white-space
:
nowrap
;
white-space
:
nowrap
;
max-width
:
$max_width
;
max-width
:
$max_width
;
}
}
@mixin
panel-colored
{
border
:
none
;
background
:
$box_bg
;
@include
box-shadow
(
0
1px
1px
rgba
(
0
,
0
,
0
,
0
.09
));
.panel-heading
{
font-weight
:
bold
;
background-color
:
$box_bg
;
}
}
app/assets/stylesheets/main/variables.scss
View file @
ab68fd22
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
*/
*/
$style_color
:
#474D57
;
$style_color
:
#474D57
;
$hover
:
#FFECDB
;
$hover
:
#FFECDB
;
$box_bg
:
#F9F9F9
;
/*
/*
* Link colors
* Link colors
...
...
app/assets/stylesheets/sections/merge_requests.scss
View file @
ab68fd22
...
@@ -104,7 +104,7 @@
...
@@ -104,7 +104,7 @@
}
}
.mr-state-widget
{
.mr-state-widget
{
background
:
#f9f9f9
;
background
:
$box_bg
;
margin-bottom
:
20px
;
margin-bottom
:
20px
;
@include
box-shadow
(
0
1px
1px
rgba
(
0
,
0
,
0
,
0
.09
));
@include
box-shadow
(
0
1px
1px
rgba
(
0
,
0
,
0
,
0
.09
));
...
...
app/views/projects/edit.html.haml
View file @
ab68fd22
...
@@ -88,14 +88,11 @@
...
@@ -88,14 +88,11 @@
.danger-settings
.danger-settings
-
if
can?
current_user
,
:archive_project
,
@project
-
if
can?
current_user
,
:archive_project
,
@project
.panel.panel-default.panel.panel-warning
-
if
@project
.
archived?
.panel
-heading
.panel
.panel-success
-
if
@project
.
archived?
.panel-heading
Unarchive project
Unarchive project
-
else
.panel-body
Archive project
.panel-body
-
if
@project
.
archived?
%p
%p
Unarchiving the project will mark its repository as active.
Unarchiving the project will mark its repository as active.
%br
%br
...
@@ -105,7 +102,11 @@
...
@@ -105,7 +102,11 @@
=
link_to
'Unarchive'
,
unarchive_project_path
(
@project
),
=
link_to
'Unarchive'
,
unarchive_project_path
(
@project
),
data:
{
confirm:
"Are you sure that you want to unarchive this project?
\n
When this project is unarchived it is active and can be committed to again."
},
data:
{
confirm:
"Are you sure that you want to unarchive this project?
\n
When this project is unarchived it is active and can be committed to again."
},
method: :post
,
class:
"btn btn-success"
method: :post
,
class:
"btn btn-success"
-
else
-
else
.panel.panel-warning
.panel-heading
Archive project
.panel-body
%p
%p
Archiving the project will mark its repository as read-only.
Archiving the project will mark its repository as read-only.
%br
%br
...
...
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