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
iv
gitlab-ce
Commits
54d95f58
Commit
54d95f58
authored
Feb 28, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restyle flash message. Not it does not overflow head panel
parent
e6b5f4ad
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
34 additions
and
36 deletions
+34
-36
app/assets/javascripts/main.js.coffee
app/assets/javascripts/main.js.coffee
+4
-4
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+9
-19
app/assets/stylesheets/sections/login.scss
app/assets/stylesheets/sections/login.scss
+2
-2
app/views/layouts/_flash.html.haml
app/views/layouts/_flash.html.haml
+8
-3
app/views/layouts/admin.html.haml
app/views/layouts/admin.html.haml
+1
-1
app/views/layouts/application.html.haml
app/views/layouts/application.html.haml
+1
-1
app/views/layouts/devise.html.haml
app/views/layouts/devise.html.haml
+4
-1
app/views/layouts/errors.html.haml
app/views/layouts/errors.html.haml
+1
-1
app/views/layouts/group.html.haml
app/views/layouts/group.html.haml
+1
-1
app/views/layouts/profile.html.haml
app/views/layouts/profile.html.haml
+1
-1
app/views/layouts/project_resource.html.haml
app/views/layouts/project_resource.html.haml
+1
-1
app/views/layouts/user_team.html.haml
app/views/layouts/user_team.html.haml
+1
-1
No files found.
app/assets/javascripts/main.js.coffee
View file @
54d95f58
...
@@ -54,10 +54,10 @@ $ ->
...
@@ -54,10 +54,10 @@ $ ->
$
(
@
).
parents
(
'form'
).
submit
()
$
(
@
).
parents
(
'form'
).
submit
()
# Flash
# Flash
if
(
flash
=
$
(
"
#
flash-container"
)).
length
>
0
if
(
flash
=
$
(
"
.
flash-container"
)).
length
>
0
flash
.
click
->
$
(
@
).
slideUp
(
"slow"
)
flash
.
click
->
$
(
@
).
fadeOut
(
)
flash
.
s
lideDown
"slow"
flash
.
s
how
()
setTimeout
(
->
flash
.
slideUp
(
"slow"
)),
3000
setTimeout
(
->
flash
.
fadeOut
(
)),
3000
# Disable form buttons while a form is submitting
# Disable form buttons while a form is submitting
$
(
'body'
).
on
'ajax:complete, ajax:beforeSend, submit'
,
'form'
,
(
e
)
->
$
(
'body'
).
on
'ajax:complete, ajax:beforeSend, submit'
,
'form'
,
(
e
)
->
...
...
app/assets/stylesheets/common.scss
View file @
54d95f58
...
@@ -67,27 +67,17 @@ table a code {
...
@@ -67,27 +67,17 @@ table a code {
}
}
/** FLASH message **/
/** FLASH message **/
#flash-container
{
.flash-container
{
height
:
50px
;
display
:
none
;
position
:
fixed
;
.alert
{
z-index
:
10001
;
top
:
0px
;
width
:
100%
;
margin-bottom
:
15px
;
overflow
:
hidden
;
background
:
white
;
cursor
:
pointer
;
cursor
:
pointer
;
border-bottom
:
1px
solid
#ccc
;
margin
:
0
;
text-align
:
center
;
text-align
:
center
;
display
:
none
;
border-radius
:
0
;
h4
{
span
{
color
:
#666
;
font-size
:
14px
;
font-size
:
18px
;
}
line-height
:
38px
;
padding-top
:
5px
;
margin
:
2px
;
font-weight
:
normal
;
}
}
}
}
...
...
app/assets/stylesheets/sections/login.scss
View file @
54d95f58
/* Login Page */
/* Login Page */
body
.login-page
{
body
.login-page
{
padding-top
:
7%
;
background
:
#EEE
;
background
:
#666
;
.container
.content
{
padding-top
:
5%
;
}
}
}
.login-box
{
.login-box
{
...
...
app/views/layouts/_flash.html.haml
View file @
54d95f58
-
if
text
=
alert
||
notice
.flash-container
#flash-container
-
if
alert
%h4
=
text
.alert
%span
=
alert
-
elsif
notice
.alert.alert-info
%span
=
notice
app/views/layouts/admin.html.haml
View file @
54d95f58
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Admin area"
=
render
"layouts/head"
,
title:
"Admin area"
%body
{
class:
"#{app_theme} admin"
}
%body
{
class:
"#{app_theme} admin"
}
=
render
"layouts/flash"
=
render
"layouts/head_panel"
,
title:
"Admin area"
=
render
"layouts/head_panel"
,
title:
"Admin area"
=
render
"layouts/flash"
.container
.container
%ul
.main_menu
%ul
.main_menu
=
nav_link
(
controller: :dashboard
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
controller: :dashboard
,
html_options:
{
class:
'home'
})
do
...
...
app/views/layouts/application.html.haml
View file @
54d95f58
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Dashboard"
=
render
"layouts/head"
,
title:
"Dashboard"
%body
{
class:
"#{app_theme} application"
}
%body
{
class:
"#{app_theme} application"
}
=
render
"layouts/flash"
=
render
"layouts/head_panel"
,
title:
"Dashboard"
=
render
"layouts/head_panel"
,
title:
"Dashboard"
=
render
"layouts/flash"
.container
.container
%ul
.main_menu
%ul
.main_menu
=
nav_link
(
path:
'dashboard#show'
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
'dashboard#show'
,
html_options:
{
class:
'home'
})
do
...
...
app/views/layouts/devise.html.haml
View file @
54d95f58
...
@@ -3,4 +3,7 @@
...
@@ -3,4 +3,7 @@
=
render
"layouts/head"
=
render
"layouts/head"
%body
.ui_basic.login-page
%body
.ui_basic.login-page
=
render
"layouts/flash"
=
render
"layouts/flash"
.container
=
yield
.container
.content
%center
=
yield
app/views/layouts/errors.html.haml
View file @
54d95f58
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Error"
=
render
"layouts/head"
,
title:
"Error"
%body
{
class:
"#{app_theme} application"
}
%body
{
class:
"#{app_theme} application"
}
=
render
"layouts/flash"
=
render
"layouts/head_panel"
,
title:
""
=
render
"layouts/head_panel"
,
title:
""
=
render
"layouts/flash"
.container
.container
.content
.content
%center
.padded.prepend-top-20
%center
.padded.prepend-top-20
...
...
app/views/layouts/group.html.haml
View file @
54d95f58
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"
#{
@group
.
name
}
"
=
render
"layouts/head"
,
title:
"
#{
@group
.
name
}
"
%body
{
class:
"#{app_theme} application"
}
%body
{
class:
"#{app_theme} application"
}
=
render
"layouts/flash"
=
render
"layouts/head_panel"
,
title:
"group:
#{
@group
.
name
}
"
=
render
"layouts/head_panel"
,
title:
"group:
#{
@group
.
name
}
"
=
render
"layouts/flash"
.container
.container
%ul
.main_menu
%ul
.main_menu
=
nav_link
(
path:
'groups#show'
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
'groups#show'
,
html_options:
{
class:
'home'
})
do
...
...
app/views/layouts/profile.html.haml
View file @
54d95f58
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Profile"
=
render
"layouts/head"
,
title:
"Profile"
%body
{
class:
"#{app_theme} profile"
}
%body
{
class:
"#{app_theme} profile"
}
=
render
"layouts/flash"
=
render
"layouts/head_panel"
,
title:
"Profile"
=
render
"layouts/head_panel"
,
title:
"Profile"
=
render
"layouts/flash"
.container
.container
%ul
.main_menu
%ul
.main_menu
=
nav_link
(
path:
'profiles#show'
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
'profiles#show'
,
html_options:
{
class:
'home'
})
do
...
...
app/views/layouts/project_resource.html.haml
View file @
54d95f58
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
@project
.
name_with_namespace
=
render
"layouts/head"
,
title:
@project
.
name_with_namespace
%body
{
class:
"#{app_theme} project"
}
%body
{
class:
"#{app_theme} project"
}
=
render
"layouts/flash"
=
render
"layouts/head_panel"
,
title:
project_title
(
@project
)
=
render
"layouts/head_panel"
,
title:
project_title
(
@project
)
=
render
"layouts/flash"
-
if
can?
(
current_user
,
:download_code
,
@project
)
-
if
can?
(
current_user
,
:download_code
,
@project
)
=
render
'shared/no_ssh'
=
render
'shared/no_ssh'
...
...
app/views/layouts/user_team.html.haml
View file @
54d95f58
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"
#{
@team
.
name
}
"
=
render
"layouts/head"
,
title:
"
#{
@team
.
name
}
"
%body
{
class:
"#{app_theme} application"
}
%body
{
class:
"#{app_theme} application"
}
=
render
"layouts/flash"
=
render
"layouts/head_panel"
,
title:
"team:
#{
@team
.
name
}
"
=
render
"layouts/head_panel"
,
title:
"team:
#{
@team
.
name
}
"
=
render
"layouts/flash"
.container
.container
%ul
.main_menu
%ul
.main_menu
=
nav_link
(
path:
'teams#show'
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
'teams#show'
,
html_options:
{
class:
'home'
})
do
...
...
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