Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
Open sidebar
ISPConfig
ISPConfig 3
Commits
bdfd7571
Commit
bdfd7571
authored
Aug 16, 2016
by
Pascal Dreissen
Browse files
Merge error local branch
parent
4d69c674
Changes
1
Hide whitespace changes
Inline
Side-by-side
interface/web/themes/default/assets/stylesheets/ispconfig.css
View file @
bdfd7571
...
...
@@ -722,7 +722,6 @@ input[type="password"].form-control[readonly] {
}
.tooltip-inner
{
max-width
:
100%
;
<<<<<<<
HEAD
}
.notification
{
width
:
35px
;
...
...
@@ -760,6 +759,4 @@ span.notification_text {
margin-bottom
:
auto
;
font-family
:
inherit
;
color
:
white
;
=======
>>>>>>>
89391e179a7677045efd1f15df091696b5f55e7e
}
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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