Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
43694bc78cdb
Unverified
Commit
32ecb027
authored
Feb 20, 2014
by
Dmitriy Zaporozhets
Browse files
Refactor scss
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
55760f0ee0bb
Changes
36
Hide whitespace changes
Inline
Side-by-side
app/assets/stylesheets/application.scss
View file @
43694bc7
...
...
@@ -37,6 +37,7 @@
@import
"generic/issue_box.scss"
;
@import
"generic/files.scss"
;
@import
"generic/lists.scss"
;
@import
"generic/flash.scss"
;
@import
"generic/forms.scss"
;
@import
"generic/selects.scss"
;
@import
"generic/highlight.scss"
;
...
...
app/assets/stylesheets/generic/blocks.scss
View file @
43694bc7
...
...
@@ -2,3 +2,18 @@
background
:
#f9f9f9
;
padding
:
15px
;
}
.centered-light-block
{
text-align
:
center
;
color
:
#888
;
margin
:
20px
;
}
.nothing-here-block
{
text-align
:
center
;
padding
:
20px
;
color
:
#666
;
font-weight
:
normal
;
font-size
:
16px
;
line-height
:
36px
;
}
app/assets/stylesheets/generic/common.scss
View file @
43694bc7
...
...
@@ -11,8 +11,6 @@
.bgred
{
background
:
#F2DEDE
!
important
}
/** COMMON CLASSES **/
.left
{
float
:left
}
.prepend-top-10
{
margin-top
:
10px
}
.prepend-top-20
{
margin-top
:
20px
}
.prepend-left-10
{
margin-left
:
10px
}
...
...
@@ -24,32 +22,9 @@
.append-bottom-20
{
margin-bottom
:
20px
}
.inline
{
display
:
inline-block
}
.padded
{
padding
:
20px
}
.ipadded
{
padding
:
20px
!
important
}
.lborder
{
border-left
:
1px
solid
#eee
}
.underlined_link
{
text-decoration
:
underline
;
}
.underlined-link
{
text-decoration
:
underline
;
}
.hint
{
font-style
:
italic
;
color
:
#999
;
}
.light
{
color
:
#888
}
.tiny
{
font-weight
:
normal
}
.vtop
{
vertical-align
:
top
!
important
;
}
/** ALERT MESSAGES **/
.alert.alert-disabled
{
background
:
#EEE
;
color
:
#777
;
border-color
:
#DDD
;
}
/** HELPERS **/
.nothing_here_message
{
text-align
:
center
;
padding
:
20px
;
color
:
#666
;
font-weight
:
normal
;
font-size
:
16px
;
line-height
:
36px
;
}
.slead
{
color
:
#666
;
...
...
@@ -59,53 +34,23 @@
line-height
:
24px
;
}
.tab-content
{
overflow
:
visible
;
}
@media
(
max-width
:
1200px
)
{
.only-wide
{
display
:
none
;
}
}
pre
.well-pre
{
border
:
1px
solid
#EEE
;
background
:
#f9f9f9
;
border-radius
:
0
;
color
:
#555
;
}
.input-append
.btn.active
,
.input-prepend
.btn.active
{
background
:
#CCC
;
border-color
:
#BBB
;
text-shadow
:
0
1px
1px
#fff
;
font-weight
:
bold
;
@include
box-shadow
(
inset
0
2px
4px
rgba
(
0
,
0
,
0
,.
15
));
}
/** Big Labels **/
.state-label
{
font-size
:
14px
;
padding
:
9px
25px
;
text-align
:
center
;
text-shadow
:
none
;
margin-right
:
20px
;
&
.state-label-blue
{
background
:
#31708f
;
color
:
#FFF
;
}
&
.state-label-green
{
background
:
#4A4
;
color
:
#FFF
;
pre
{
&
.clean
{
background
:
none
;
border
:
none
;
margin
:
0
;
padding
:
0
;
}
&
.state-label-red
{
background
:
#DA4E49
;
color
:
#FFF
;
&
.well-pre
{
border
:
1px
solid
#EEE
;
background
:
#f9f9f9
;
border-radius
:
0
;
color
:
#555
;
}
}
...
...
@@ -135,31 +80,6 @@ pre.well-pre {
}
/** FLASH message **/
.flash-container
{
display
:
none
;
cursor
:
pointer
;
margin
:
0
;
text-align
:
center
;
color
:
#fff
;
font-size
:
14px
;
position
:
fixed
;
bottom
:
0
;
width
:
100%
;
opacity
:
0
.8
;
z-index
:
100
;
.flash-notice
{
background
:
#49C
;
padding
:
10px
;
text-shadow
:
0
1px
1px
#178
;
}
.flash-alert
{
background
:
#C67
;
text-shadow
:
0
1px
1px
#945
;
padding
:
10px
;
}
}
.author_link
{
color
:
$link_color
;
}
...
...
@@ -279,22 +199,6 @@ li.note {
cursor
:
pointer
;
}
.merge-request
,
.issue
{
&
.today
{
background
:
#EFE
;
border-color
:
#CEC
;
}
&
.closed
{
background
:
#F5f5f5
;
border-color
:
#E5E5E5
;
}
&
.merged
{
background
:
#F5f5f5
;
border-color
:
#E5E5E5
;
}
}
.git_error_tips
{
@extend
.col-md-6
;
text-align
:
left
;
...
...
@@ -358,15 +262,6 @@ li.note {
}
}
pre
{
&
.clean
{
background
:
none
;
border
:
none
;
margin
:
0
;
padding
:
0
;
}
}
.milestone
{
&
.milestone-closed
{
background
:
#eee
;
...
...
@@ -450,40 +345,6 @@ table {
margin-bottom
:
20px
;
}
.ajax-users-select
{
width
:
400px
;
&
.input-large
{
width
:
210px
;
}
&
.input-clamp
{
max-width
:
100%
;
}
}
.user-result
{
.user-image
{
float
:
left
;
}
.user-name
{
}
.user-username
{
color
:
#999
;
}
}
.namespace-result
{
.namespace-kind
{
color
:
#AAA
;
font-weight
:
normal
;
}
.namespace-path
{
margin-left
:
10px
;
font-weight
:
bolder
;
}
}
.btn-sign-in
{
margin-top
:
7px
;
text-shadow
:
none
;
...
...
app/assets/stylesheets/generic/flash.scss
0 → 100644
View file @
43694bc7
.flash-container
{
display
:
none
;
cursor
:
pointer
;
margin
:
0
;
text-align
:
center
;
color
:
#fff
;
font-size
:
14px
;
position
:
fixed
;
bottom
:
0
;
width
:
100%
;
opacity
:
0
.8
;
z-index
:
100
;
.flash-notice
{
background
:
#49C
;
padding
:
10px
;
text-shadow
:
0
1px
1px
#178
;
}
.flash-alert
{
background
:
#C67
;
text-shadow
:
0
1px
1px
#945
;
padding
:
10px
;
}
}
app/assets/stylesheets/generic/issue_box.scss
View file @
43694bc7
...
...
@@ -48,4 +48,27 @@
margin
:
0
;
}
}
.state-label
{
font-size
:
14px
;
padding
:
9px
25px
;
text-align
:
center
;
text-shadow
:
none
;
margin-right
:
20px
;
&
.state-label-blue
{
background
:
#31708f
;
color
:
#FFF
;
}
&
.state-label-green
{
background
:
#4A4
;
color
:
#FFF
;
}
&
.state-label-red
{
background
:
#DA4E49
;
color
:
#FFF
;
}
}
}
app/assets/stylesheets/generic/selects.scss
View file @
43694bc7
...
...
@@ -87,3 +87,37 @@ select {
padding-top
:
4px
;
}
}
.ajax-users-select
{
width
:
400px
;
&
.input-large
{
width
:
210px
;
}
&
.input-clamp
{
max-width
:
100%
;
}
}
.user-result
{
.user-image
{
float
:
left
;
}
.user-name
{
}
.user-username
{
color
:
#999
;
}
}
.namespace-result
{
.namespace-kind
{
color
:
#AAA
;
font-weight
:
normal
;
}
.namespace-path
{
margin-left
:
10px
;
font-weight
:
bolder
;
}
}
app/assets/stylesheets/sections/issues.scss
View file @
43694bc7
...
...
@@ -125,3 +125,21 @@
form
.edit-issue
{
margin
:
0
;
}
.merge-request
,
.issue
{
&
.today
{
background
:
#EFE
;
border-color
:
#CEC
;
}
&
.closed
{
background
:
#F5f5f5
;
border-color
:
#E5E5E5
;
}
&
.merged
{
background
:
#F5f5f5
;
border-color
:
#E5E5E5
;
}
}
app/views/admin/projects/index.html.haml
View file @
43694bc7
...
...
@@ -53,5 +53,5 @@
=
link_to
'Edit'
,
edit_project_path
(
project
),
id:
"edit_
#{
dom_id
(
project
)
}
"
,
class:
"btn btn-small"
=
link_to
'Destroy'
,
[
project
],
data:
{
confirm:
remove_project_message
(
project
)
},
method: :delete
,
class:
"btn btn-small btn-remove"
-
if
@projects
.
blank?
%p
.nothing
_
here
_message
0 projects matches
.nothing
-
here
-block
0 projects matches
=
paginate
@projects
,
theme:
"gitlab"
app/views/dashboard/_activities.html.haml
View file @
43694bc7
...
...
@@ -4,6 +4,6 @@
-
if
@events
.
any?
.content_list
-
else
%p
.nothing
_
here
_message
Projects activity will be displayed here
.nothing
-
here
-block
Projects activity will be displayed here
=
spinner
app/views/dashboard/_groups.html.haml
View file @
43694bc7
...
...
@@ -17,4 +17,4 @@
%i
.icon-angle-right
-
if
groups
.
blank?
%li
%h3
.nothing
_
here
_message
You have no groups yet.
.nothing
-
here
-block
You have no groups yet.
app/views/dashboard/_projects.html.haml
View file @
43694bc7
...
...
@@ -14,7 +14,7 @@
-
if
projects
.
blank?
%li
%h3
.nothing
_
here
_message
There are no projects here.
.nothing
-
here
-block
There are no projects here.
-
if
@projects_count
>
@projects_limit
%li
.bottom
%span
.light
...
...
app/views/dashboard/projects.html.haml
View file @
43694bc7
...
...
@@ -67,7 +67,7 @@
-
if
@projects
.
blank?
%li
%h3
.nothing
_
here
_message
There are no projects here.
.nothing
-
here
-block
There are no projects here.
.bottom
=
paginate
@projects
,
theme:
"gitlab"
app/views/groups/_filter.html.haml
View file @
43694bc7
...
...
@@ -21,7 +21,7 @@
=
project
.
name_with_namespace
%small
.pull-right
=
entities_per_project
(
project
,
entity
)
-
if
@projects
.
blank?
%p
.nothing
_
here
_message
This group has no projects yet
.nothing
-
here
-block
This group has no projects yet
%fieldset
%hr
...
...
app/views/groups/_projects.html.haml
View file @
43694bc7
...
...
@@ -8,7 +8,7 @@
New project
%ul
.well-list
-
if
projects
.
blank?
%p
.nothing
_
here
_message
This groups has no projects yet
.nothing
-
here
-block
This groups has no projects yet
-
projects
.
each
do
|
project
|
%li
.project-row
=
link_to
project_path
(
project
),
class:
dom_class
(
project
)
do
...
...
app/views/groups/edit.html.haml
View file @
43694bc7
...
...
@@ -80,7 +80,7 @@
=
link_to
'Edit'
,
edit_project_path
(
project
),
id:
"edit_
#{
dom_id
(
project
)
}
"
,
class:
"btn btn-small"
=
link_to
'Remove'
,
project
,
data:
{
confirm:
remove_project_message
(
project
)},
method: :delete
,
class:
"btn btn-small btn-remove"
-
if
@group
.
projects
.
blank?
%p
.nothing
_
here
_message
This group has no projects yet
.nothing
-
here
-block
This group has no projects yet
.tab-pane
#tab-remove
.ui-box.ui-box-danger
...
...
app/views/groups/show.html.haml
View file @
43694bc7
...
...
@@ -10,7 +10,7 @@
-
if
@events
.
any?
.content_list
-
else
%p
.nothing
_
here
_message
Project activity will be displayed here
.nothing
-
here
-block
Project activity will be displayed here
=
spinner
.side.col-md-4
.light-well.append-bottom-20
...
...
app/views/profiles/keys/index.html.haml
View file @
43694bc7
...
...
@@ -17,6 +17,6 @@
=
render
@keys
-
if
@keys
.
blank?
%li
%h3
.nothing
_
here
_message
There are no SSH keys with access to your account.
.nothing
-
here
-block
There are no SSH keys with access to your account.
app/views/projects/blob/_text.html.haml
View file @
43694bc7
...
...
@@ -10,4 +10,4 @@
-
unless
blob
.
empty?
=
render
'shared/file_hljs'
,
blob:
blob
-
else
%p
.nothing
_
here
_message
Empty file
.nothing
-
here
-block
Empty file
app/views/projects/commits/_diffs.html.haml
View file @
43694bc7
...
...
@@ -8,18 +8,18 @@
-
if
current_controller?
(
:commit
)
or
current_controller?
(
:merge_requests
)
Please, download the diff as
-
if
current_controller?
(
:commit
)
=
link_to
"plain diff"
,
project_commit_path
(
@project
,
@commit
,
format: :diff
),
class:
"underlined
_
link"
=
link_to
"plain diff"
,
project_commit_path
(
@project
,
@commit
,
format: :diff
),
class:
"underlined
-
link"
or
=
link_to
"email patch"
,
project_commit_path
(
@project
,
@commit
,
format: :patch
),
class:
"underlined
_
link"
=
link_to
"email patch"
,
project_commit_path
(
@project
,
@commit
,
format: :patch
),
class:
"underlined
-
link"
-
else
=
link_to
"plain diff"
,
project_merge_request_path
(
@project
,
@merge_request
,
format: :diff
),
class:
"underlined
_
link"
=
link_to
"plain diff"
,
project_merge_request_path
(
@project
,
@merge_request
,
format: :diff
),
class:
"underlined
-
link"
or
=
link_to
"email patch"
,
project_merge_request_path
(
@project
,
@merge_request
,
format: :patch
),
class:
"underlined
_
link"
=
link_to
"email patch"
,
project_merge_request_path
(
@project
,
@merge_request
,
format: :patch
),
class:
"underlined
-
link"
instead.
-
unless
@force_suppress_diff
%p
If you still want to see the diff
=
link_to
"click this link"
,
url_for
(
force_show_diff:
true
),
class:
"underlined
_
link"
=
link_to
"click this link"
,
url_for
(
force_show_diff:
true
),
class:
"underlined
-
link"
%p
.commit-stat-summary
Showing
...
...
@@ -74,4 +74,4 @@
-
old_file
=
project
.
repository
.
blob_at
(
@commit
.
parent_id
,
diff
.
old_path
)
if
@commit
.
parent_id
=
render
"projects/commits/image"
,
diff:
diff
,
old_file:
old_file
,
file:
file
,
index:
i
-
else
%p
.nothing
_
here
_message
No preview for this file type
.nothing
-
here
-block
No preview for this file type
app/views/projects/deploy_keys/index.html.haml
View file @
43694bc7
...
...
@@ -20,7 +20,7 @@
=
render
@enabled_keys
-
if
@enabled_keys
.
blank?
.light-well
%p
.nothing
_
here
_message
Create a
#{
link_to
'new deploy key'
,
new_project_deploy_key_path
(
@project
)
}
or add an existing one
.nothing
-
here
-block
Create a
#{
link_to
'new deploy key'
,
new_project_deploy_key_path
(
@project
)
}
or add an existing one
.col-md-6.available-keys
%h5
%strong
Deploy keys
...
...
@@ -29,4 +29,4 @@
=
render
@available_keys
-
if
@available_keys
.
blank?
.light-well
%p
.nothing
_
here
_message
Deploy keys from projects you have access to will be displayed here
.nothing
-
here
-block
Deploy keys from projects you have access to will be displayed here
Prev
1
2
Next
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