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
Boxiang Sun
gitlab-ce
Commits
0cd873c2
Commit
0cd873c2
authored
Feb 12, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed layout for ipad. changed main width
parent
c0e622ea
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
23 deletions
+11
-23
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+3
-11
app/assets/stylesheets/main.scss
app/assets/stylesheets/main.scss
+2
-2
app/views/layouts/_project_menu.html.haml
app/views/layouts/_project_menu.html.haml
+1
-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
+1
-1
app/views/layouts/profile.html.haml
app/views/layouts/profile.html.haml
+1
-3
app/views/layouts/project.html.haml
app/views/layouts/project.html.haml
+1
-1
No files found.
app/assets/stylesheets/common.scss
View file @
0cd873c2
...
@@ -71,14 +71,12 @@ a {
...
@@ -71,14 +71,12 @@ a {
/** LAYOUT **/
/** LAYOUT **/
.container-fluid
{
.container
{
min-width
:
$min_app_width
;
width
:
$min_app_width
;
max-width
:
$max_app_width
;
margin
:auto
;
margin-top
:
62px
;
margin-top
:
62px
;
}
}
.container
-fluid
.sidebar
{
.container
.sidebar
{
width
:
250px
;
width
:
250px
;
height
:
100%
;
height
:
100%
;
min-height
:
450px
;
min-height
:
450px
;
...
@@ -133,12 +131,6 @@ nav.main_menu {
...
@@ -133,12 +131,6 @@ nav.main_menu {
}
}
}
}
.container-fluid
>
.content
{
margin-left
:
0px
;
margin-top
:
20px
;
}
aside
.projects
,
aside
.projects
,
aside
.project-side
aside
.project-side
{
{
...
...
app/assets/stylesheets/main.scss
View file @
0cd873c2
...
@@ -9,8 +9,8 @@ $active_bg_color:#79C3E0;
...
@@ -9,8 +9,8 @@ $active_bg_color:#79C3E0;
$active_bd_color
:
#2FA0BB
;
$active_bd_color
:
#2FA0BB
;
$border_color
:
#CCC
;
$border_color
:
#CCC
;
$lite_border_color
:
#EEE
;
$lite_border_color
:
#EEE
;
$min_app_width
:
9
8
0px
;
$min_app_width
:
9
6
0px
;
$max_app_width
:
9
8
0px
;
$max_app_width
:
9
6
0px
;
$app_padding
:
20px
;
$app_padding
:
20px
;
$bg_color
:
#FFF
;
$bg_color
:
#FFF
;
$styled_border_color
:
#2FA0BB
;
$styled_border_color
:
#2FA0BB
;
...
...
app/views/layouts/_project_menu.html.haml
View file @
0cd873c2
...
@@ -17,6 +17,4 @@
...
@@ -17,6 +17,4 @@
-
if
@project
.
wall_enabled
-
if
@project
.
wall_enabled
=
link_to
wall_project_path
(
@project
),
:class
=>
current_page?
(
:controller
=>
"projects"
,
:action
=>
"wall"
,
:id
=>
@project
)
?
"current"
:
nil
do
=
link_to
wall_project_path
(
@project
),
:class
=>
current_page?
(
:controller
=>
"projects"
,
:action
=>
"wall"
,
:id
=>
@project
)
?
"current"
:
nil
do
@Wall
Wall
-
if
@project
.
common_notes
.
today
.
count
>
0
%span
.label
=
@project
.
common_notes
.
today
.
count
app/views/layouts/admin.html.haml
View file @
0cd873c2
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
%body
.admin
%body
.admin
=
render
"layouts/flash"
=
render
"layouts/flash"
=
render
"layouts/head_panel"
,
:title
=>
"Admin area"
=
render
"layouts/head_panel"
,
:title
=>
"Admin area"
.container
-fluid
.container
%nav
.main_menu
%nav
.main_menu
=
link_to
"Users"
,
admin_users_path
,
:class
=>
controller
.
controller_name
==
"users"
?
"current"
:
nil
=
link_to
"Users"
,
admin_users_path
,
:class
=>
controller
.
controller_name
==
"users"
?
"current"
:
nil
=
link_to
"Projects"
,
admin_projects_path
,
:class
=>
controller
.
controller_name
==
"projects"
?
"current"
:
nil
=
link_to
"Projects"
,
admin_projects_path
,
:class
=>
controller
.
controller_name
==
"projects"
?
"current"
:
nil
...
...
app/views/layouts/application.html.haml
View file @
0cd873c2
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
%body
.application
%body
.application
=
render
"layouts/flash"
=
render
"layouts/flash"
=
render
"layouts/head_panel"
,
:title
=>
"Dashboard"
=
render
"layouts/head_panel"
,
:title
=>
"Dashboard"
.container
-fluid
.container
=
render
:partial
=>
"layouts/app_menu"
=
render
:partial
=>
"layouts/app_menu"
.content
.content
.row
.row
...
...
app/views/layouts/devise.html.haml
View file @
0cd873c2
...
@@ -3,4 +3,4 @@
...
@@ -3,4 +3,4 @@
=
render
"layouts/head"
=
render
"layouts/head"
%body
.login-page
%body
.login-page
=
render
:partial
=>
"layouts/flash"
=
render
:partial
=>
"layouts/flash"
.container
-fluid
=
yield
.container
=
yield
app/views/layouts/profile.html.haml
View file @
0cd873c2
...
@@ -4,15 +4,13 @@
...
@@ -4,15 +4,13 @@
%body
.profile
%body
.profile
=
render
"layouts/flash"
=
render
"layouts/flash"
=
render
"layouts/head_panel"
,
:title
=>
"Profile"
=
render
"layouts/head_panel"
,
:title
=>
"Profile"
.container
-fluid
.container
%nav
.main_menu
%nav
.main_menu
=
link_to
"Profile"
,
profile_path
,
:class
=>
current_page?
(
:controller
=>
"profile"
,
:action
=>
:show
)
?
"current"
:
nil
=
link_to
"Profile"
,
profile_path
,
:class
=>
current_page?
(
:controller
=>
"profile"
,
:action
=>
:show
)
?
"current"
:
nil
=
link_to
"Password & token"
,
profile_password_path
,
:class
=>
current_page?
(
:controller
=>
"profile"
,
:action
=>
:password
)
?
"current"
:
nil
=
link_to
"Password & token"
,
profile_password_path
,
:class
=>
current_page?
(
:controller
=>
"profile"
,
:action
=>
:password
)
?
"current"
:
nil
=
link_to
"Design"
,
profile_design_path
,
:class
=>
current_page?
(
:controller
=>
"profile"
,
:action
=>
:design
)
?
"current"
:
nil
=
link_to
"Design"
,
profile_design_path
,
:class
=>
current_page?
(
:controller
=>
"profile"
,
:action
=>
:design
)
?
"current"
:
nil
=
link_to
keys_path
,
:class
=>
controller
.
controller_name
==
"keys"
?
"current"
:
nil
do
=
link_to
keys_path
,
:class
=>
controller
.
controller_name
==
"keys"
?
"current"
:
nil
do
Keys
Keys
-
unless
current_user
.
keys
.
empty?
%span
.label
=
current_user
.
keys
.
count
.content
.content
.row
.row
.span12
=
yield
.span12
=
yield
...
...
app/views/layouts/project.html.haml
View file @
0cd873c2
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
%body
.project
%body
.project
=
render
"layouts/flash"
=
render
"layouts/flash"
=
render
"layouts/head_panel"
,
:title
=>
@project
.
name
=
render
"layouts/head_panel"
,
:title
=>
@project
.
name
.container
-fluid
.container
=
render
:partial
=>
"layouts/project_menu"
=
render
:partial
=>
"layouts/project_menu"
.content
.content
-
if
@full_content
-
if
@full_content
...
...
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