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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
0b017e8e
Commit
0b017e8e
authored
Jan 06, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
twbs3 fixes for UI
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
7399c8c9
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
8 deletions
+8
-8
app/assets/stylesheets/sections/profile.scss
app/assets/stylesheets/sections/profile.scss
+1
-1
app/views/profiles/notifications/_settings.html.haml
app/views/profiles/notifications/_settings.html.haml
+2
-2
app/views/profiles/notifications/show.html.haml
app/views/profiles/notifications/show.html.haml
+2
-2
app/views/projects/_settings_nav.html.haml
app/views/projects/_settings_nav.html.haml
+1
-1
app/views/projects/milestones/index.html.haml
app/views/projects/milestones/index.html.haml
+1
-1
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+1
-1
No files found.
app/assets/stylesheets/sections/profile.scss
View file @
0b017e8e
.update-notifications
{
.update-notifications
{
.radio-inline
{
.radio-inline
{
margin-right
:
30px
;
margin-right
:
9%
;
}
}
}
}
...
...
app/views/profiles/notifications/_settings.html.haml
View file @
0b017e8e
%li
%li
.row
.row
.col-
md
-4
.col-
sm
-4
%span
%span
=
notification_icon
(
notification
)
=
notification_icon
(
notification
)
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
=
link_to
membership
.
group
.
name
,
membership
.
group
=
link_to
membership
.
group
.
name
,
membership
.
group
-
else
-
else
=
link_to_project
(
membership
.
project
)
=
link_to_project
(
membership
.
project
)
.col-
md-7
.col-
sm-8
=
form_tag
profile_notifications_path
,
method: :put
,
remote:
true
,
class:
'update-notifications'
do
=
form_tag
profile_notifications_path
,
method: :put
,
remote:
true
,
class:
'update-notifications'
do
=
hidden_field_tag
:notification_type
,
type
,
id:
dom_id
(
membership
,
'notification_type'
)
=
hidden_field_tag
:notification_type
,
type
,
id:
dom_id
(
membership
,
'notification_type'
)
=
hidden_field_tag
:notification_id
,
membership
.
id
,
id:
dom_id
(
membership
,
'notification_id'
)
=
hidden_field_tag
:notification_id
,
membership
.
id
,
id:
dom_id
(
membership
,
'notification_id'
)
...
...
app/views/profiles/notifications/show.html.haml
View file @
0b017e8e
...
@@ -18,11 +18,11 @@
...
@@ -18,11 +18,11 @@
–
You will receive all notifications from projects in which you participate
–
You will receive all notifications from projects in which you participate
.row
.row
.col-
md
-4
.col-
sm
-4
%h4
%h4
=
notification_icon
(
@notification
)
=
notification_icon
(
@notification
)
Global setting
Global setting
.col-
md-7
.col-
sm-8
=
form_tag
profile_notifications_path
,
method: :put
,
remote:
true
,
class:
'update-notifications'
do
=
form_tag
profile_notifications_path
,
method: :put
,
remote:
true
,
class:
'update-notifications'
do
=
hidden_field_tag
:notification_type
,
'global'
=
hidden_field_tag
:notification_type
,
'global'
...
...
app/views/projects/_settings_nav.html.haml
View file @
0b017e8e
%ul
.nav.nav-pills.nav-stacked.nav-stacked-menu
%ul
.nav.nav-pills.nav-stacked.nav-stacked-menu
.append-bottom-20
=
nav_link
(
path:
'projects#edit'
)
do
=
nav_link
(
path:
'projects#edit'
)
do
=
link_to
edit_project_path
(
@project
),
class:
"stat-tab tab "
do
=
link_to
edit_project_path
(
@project
),
class:
"stat-tab tab "
do
%i
.icon-edit
%i
.icon-edit
...
...
app/views/projects/milestones/index.html.haml
View file @
0b017e8e
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
New Milestone
New Milestone
.row
.row
.col-md-3
.col-md-3
.hidden-sm
%ul
.nav.nav-pills.nav-stacked
%ul
.nav.nav-pills.nav-stacked
%li
{
class:
(
"active"
if
(
params
[
:f
]
==
"active"
||
!
params
[
:f
]))}
%li
{
class:
(
"active"
if
(
params
[
:f
]
==
"active"
||
!
params
[
:f
]))}
=
link_to
project_milestones_path
(
@project
,
f:
"active"
)
do
=
link_to
project_milestones_path
(
@project
,
f:
"active"
)
do
...
...
app/views/projects/milestones/show.html.haml
View file @
0b017e8e
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
=
markdown
@milestone
.
description
=
markdown
@milestone
.
description
%ul
.nav.nav-tabs
%ul
.nav.nav-tabs
.append-bottom-10
%li
.active
%li
.active
=
link_to
'#tab-issues'
,
'data-toggle'
=>
'tab'
do
=
link_to
'#tab-issues'
,
'data-toggle'
=>
'tab'
do
Issues
Issues
...
...
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