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
Jérome Perrin
gitlab-ce
Commits
5c3e0f61
Commit
5c3e0f61
authored
Dec 31, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix forms and header
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
1b1a408a
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
37 additions
and
8 deletions
+37
-8
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+1
-1
app/assets/stylesheets/gitlab_bootstrap/forms.scss
app/assets/stylesheets/gitlab_bootstrap/forms.scss
+18
-0
app/assets/stylesheets/gitlab_bootstrap/ui_box.scss
app/assets/stylesheets/gitlab_bootstrap/ui_box.scss
+1
-0
app/assets/stylesheets/sections/dashboard.scss
app/assets/stylesheets/sections/dashboard.scss
+1
-1
app/assets/stylesheets/sections/editor.scss
app/assets/stylesheets/sections/editor.scss
+1
-1
app/assets/stylesheets/sections/events.scss
app/assets/stylesheets/sections/events.scss
+1
-1
app/assets/stylesheets/sections/header.scss
app/assets/stylesheets/sections/header.scss
+12
-2
app/assets/stylesheets/sections/notes.scss
app/assets/stylesheets/sections/notes.scss
+1
-1
app/assets/stylesheets/sections/wall.scss
app/assets/stylesheets/sections/wall.scss
+1
-1
No files found.
app/assets/stylesheets/common.scss
View file @
5c3e0f61
...
@@ -209,7 +209,7 @@ li.note {
...
@@ -209,7 +209,7 @@ li.note {
}
}
.git_error_tips
{
.git_error_tips
{
@extend
.
span
6
;
@extend
.
col-md-
6
;
text-align
:
left
;
text-align
:
left
;
margin-top
:
40px
;
margin-top
:
40px
;
pre
{
pre
{
...
...
app/assets/stylesheets/gitlab_bootstrap/forms.scss
View file @
5c3e0f61
input
[
type
=
"text"
],
input
[
type
=
"password"
],
input
[
type
=
"search"
],
input
[
type
=
"email"
]
{
@extend
.form-control
;
}
form
{
form
{
@extend
.form-horizontal
;
@extend
.form-horizontal
;
label
{
label
{
@extend
.control-label
;
@extend
.control-label
;
@extend
.col-sm-2
;
&
.radio-label
{
&
.radio-label
{
text-align
:
left
;
text-align
:
left
;
...
@@ -33,10 +38,14 @@ input.input-xpadding,
...
@@ -33,10 +38,14 @@ input.input-xpadding,
}
}
.control-group
{
.control-group
{
@extend
.form-group
;
.control-label
{
.control-label
{
padding-top
:
6px
;
padding-top
:
6px
;
}
}
.controls
{
.controls
{
@extend
.col-sm-10
;
input
,
textarea
{
input
,
textarea
{
padding
:
6px
10px
;
padding
:
6px
10px
;
}
}
...
@@ -76,3 +85,12 @@ fieldset legend {
...
@@ -76,3 +85,12 @@ fieldset legend {
width
:
100px
;
width
:
100px
;
}
}
}
}
.form-actions
{
padding
:
17px
20px
18px
;
margin-top
:
18px
;
margin-bottom
:
18px
;
background-color
:
whitesmoke
;
border-top
:
1px
solid
#e5e5e5
;
padding-left
:
180px
;
}
app/assets/stylesheets/gitlab_bootstrap/ui_box.scss
View file @
5c3e0f61
...
@@ -43,6 +43,7 @@
...
@@ -43,6 +43,7 @@
ul
{
ul
{
margin
:
0
;
margin
:
0
;
padding
:
0
;
}
}
.title
{
.title
{
...
...
app/assets/stylesheets/sections/dashboard.scss
View file @
5c3e0f61
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
.search-text-input
{
.search-text-input
{
float
:left
;
float
:left
;
@extend
.
span
2
;
@extend
.
col-md-
2
;
}
}
.btn
{
.btn
{
margin-left
:
5px
;
margin-left
:
5px
;
...
...
app/assets/stylesheets/sections/editor.scss
View file @
5c3e0f61
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
line-height
:
20px
;
line-height
:
20px
;
}
}
textarea
{
textarea
{
@extend
.
span
8
;
@extend
.
col-md-
8
;
}
}
}
}
}
}
app/assets/stylesheets/sections/events.scss
View file @
5c3e0f61
...
@@ -147,7 +147,7 @@
...
@@ -147,7 +147,7 @@
float
:
left
;
float
:
left
;
padding
:
9px
6px
;
padding
:
9px
6px
;
font-size
:
18px
;
font-size
:
18px
;
width
:
26
px
;
width
:
40
px
;
@include
border-radius
(
3px
);
@include
border-radius
(
3px
);
}
}
...
...
app/assets/stylesheets/sections/header.scss
View file @
5c3e0f61
...
@@ -5,6 +5,9 @@
...
@@ -5,6 +5,9 @@
header
{
header
{
&
.navbar-gitlab
{
&
.navbar-gitlab
{
margin-bottom
:
0
;
margin-bottom
:
0
;
height
:
40px
;
overflow
:
hidden
;
.navbar-inner
{
.navbar-inner
{
/*height: 40px;*/
/*height: 40px;*/
padding
:
3px
;
padding
:
3px
;
...
@@ -92,12 +95,19 @@ header {
...
@@ -92,12 +95,19 @@ header {
.search
{
.search
{
margin-right
:
10px
;
margin-right
:
10px
;
margin-left
:
10px
;
margin-left
:
10px
;
margin-top
:
5px
;
form
{
margin
:
0
;
}
.search-input
{
.search-input
{
@extend
.span3
;
width
:
300px
;
background-image
:
url("icon-search.png")
;
background-image
:
url("icon-search.png")
;
background-repeat
:
no-repeat
;
background-repeat
:
no-repeat
;
background-position
:
10px
;
background-position
:
10px
;
height
:
inherit
;
padding
:
4px
6px
;
padding-left
:
25px
;
padding-left
:
25px
;
font-size
:
13px
;
font-size
:
13px
;
@include
border-radius
(
3px
);
@include
border-radius
(
3px
);
...
@@ -105,7 +115,7 @@ header {
...
@@ -105,7 +115,7 @@ header {
box-shadow
:
none
;
box-shadow
:
none
;
@include
transition
(
all
0
.15s
ease-in
0s
);
@include
transition
(
all
0
.15s
ease-in
0s
);
&
:focus
{
&
:focus
{
@extend
.
span
4
;
@extend
.
col-md-
4
;
}
}
}
}
}
}
...
...
app/assets/stylesheets/sections/notes.scss
View file @
5c3e0f61
...
@@ -302,7 +302,7 @@ ul.notes {
...
@@ -302,7 +302,7 @@ ul.notes {
}
}
.note-image-attach
{
.note-image-attach
{
@extend
.
span
4
;
@extend
.
col-md-
4
;
@extend
.thumbnail
;
@extend
.thumbnail
;
margin-left
:
45px
;
margin-left
:
45px
;
}
}
...
...
app/assets/stylesheets/sections/wall.scss
View file @
5c3e0f61
.wall-page
{
.wall-page
{
.wall-note-form
{
.wall-note-form
{
@extend
.
span
12
;
@extend
.
col-md-
12
;
margin
:
0
;
margin
:
0
;
height
:
140px
;
height
:
140px
;
...
...
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