Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
42229d01
Verified
Commit
42229d01
authored
Sep 15, 2017
by
Sébastiaan Versteeg
Browse files
Remove duplicate image files and fix glyphicons url in CSS
parent
bb3d864a
Changes
3
Hide whitespace changes
Inline
Side-by-side
website/thaliawebsite/static/css/bootstrap.min.css
View file @
42229d01
...
...
@@ -378,8 +378,8 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-
.btn-link
{
border-color
:
transparent
;
cursor
:
pointer
;
color
:
#0088cc
;
-webkit-border-radius
:
0
;
-moz-border-radius
:
0
;
border-radius
:
0
;}
.btn-link
:hover
,
.btn-link
:focus
{
color
:
#005580
;
text-decoration
:
underline
;
background-color
:
transparent
;}
.btn-link
[
disabled
]
:hover
,
.btn-link
[
disabled
]
:focus
{
color
:
#333333
;
text-decoration
:
none
;}
[
class
^=
"icon-"
],[
class
*=
" icon-"
]
{
display
:
inline-block
;
width
:
14px
;
height
:
14px
;
*
margin-right
:
.3em
;
line-height
:
14px
;
vertical-align
:
text-top
;
background-image
:
url("../
assets/
images/glyphicons-halflings.png")
;
background-position
:
14px
14px
;
background-repeat
:
no-repeat
;
margin-top
:
1px
;}
.icon-white
,
.nav-pills
>
.active
>
a
>[
class
^=
"icon-"
],
.nav-pills
>
.active
>
a
>[
class
*=
" icon-"
],
.nav-list
>
.active
>
a
>[
class
^=
"icon-"
],
.nav-list
>
.active
>
a
>[
class
*=
" icon-"
],
.navbar-inverse
.nav
>
.active
>
a
>[
class
^=
"icon-"
],
.navbar-inverse
.nav
>
.active
>
a
>[
class
*=
" icon-"
],
.dropdown-menu
>
li
>
a
:hover
>[
class
^=
"icon-"
],
.dropdown-menu
>
li
>
a
:focus
>[
class
^=
"icon-"
],
.dropdown-menu
>
li
>
a
:hover
>[
class
*=
" icon-"
],
.dropdown-menu
>
li
>
a
:focus
>[
class
*=
" icon-"
],
.dropdown-menu
>
.active
>
a
>[
class
^=
"icon-"
],
.dropdown-menu
>
.active
>
a
>[
class
*=
" icon-"
],
.dropdown-submenu
:hover
>
a
>[
class
^=
"icon-"
],
.dropdown-submenu
:focus
>
a
>[
class
^=
"icon-"
],
.dropdown-submenu
:hover
>
a
>[
class
*=
" icon-"
],
.dropdown-submenu
:focus
>
a
>[
class
*=
" icon-"
]
{
background-image
:
url("../
assets/
images/glyphicons-halflings-white.png")
;}
[
class
^=
"icon-"
],[
class
*=
" icon-"
]
{
display
:
inline-block
;
width
:
14px
;
height
:
14px
;
*
margin-right
:
.3em
;
line-height
:
14px
;
vertical-align
:
text-top
;
background-image
:
url("../images/glyphicons-halflings.png")
;
background-position
:
14px
14px
;
background-repeat
:
no-repeat
;
margin-top
:
1px
;}
.icon-white
,
.nav-pills
>
.active
>
a
>[
class
^=
"icon-"
],
.nav-pills
>
.active
>
a
>[
class
*=
" icon-"
],
.nav-list
>
.active
>
a
>[
class
^=
"icon-"
],
.nav-list
>
.active
>
a
>[
class
*=
" icon-"
],
.navbar-inverse
.nav
>
.active
>
a
>[
class
^=
"icon-"
],
.navbar-inverse
.nav
>
.active
>
a
>[
class
*=
" icon-"
],
.dropdown-menu
>
li
>
a
:hover
>[
class
^=
"icon-"
],
.dropdown-menu
>
li
>
a
:focus
>[
class
^=
"icon-"
],
.dropdown-menu
>
li
>
a
:hover
>[
class
*=
" icon-"
],
.dropdown-menu
>
li
>
a
:focus
>[
class
*=
" icon-"
],
.dropdown-menu
>
.active
>
a
>[
class
^=
"icon-"
],
.dropdown-menu
>
.active
>
a
>[
class
*=
" icon-"
],
.dropdown-submenu
:hover
>
a
>[
class
^=
"icon-"
],
.dropdown-submenu
:focus
>
a
>[
class
^=
"icon-"
],
.dropdown-submenu
:hover
>
a
>[
class
*=
" icon-"
],
.dropdown-submenu
:focus
>
a
>[
class
*=
" icon-"
]
{
background-image
:
url("../images/glyphicons-halflings-white.png")
;}
.icon-glass
{
background-position
:
0
0
;}
.icon-music
{
background-position
:
-24px
0
;}
.icon-search
{
background-position
:
-48px
0
;}
...
...
website/thaliawebsite/static/img/glyphicons-halflings-white.png
deleted
100644 → 0
View file @
bb3d864a
8.57 KB
website/thaliawebsite/static/img/glyphicons-halflings.png
deleted
100644 → 0
View file @
bb3d864a
12.5 KB
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