Skip to content
This repository has been archived by the owner on Dec 18, 2019. It is now read-only.

combined PR 12 and 11 (php tags and relative pathing) #14

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

combined PR 12 and 11 (php tags and relative pathing) #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions htdocs/assets/css/datepicker.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
padding: 18px 12px 10px;
border-bottom: 1px solid #ECECEC;
margin-top: -8px;
background: url('/images/pointer-datepicker.png') no-repeat 20px 0 transparent;
background: url('images/pointer-datepicker.png') no-repeat 20px 0 transparent;
}
.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next {
background: url('/images/sprites/main-sprite.png') no-repeat scroll 0 -695px transparent;
background: url('images/sprites/main-sprite.png') no-repeat scroll 0 -695px transparent;
cursor: pointer;
height: 18px;
outline: medium none;
Expand Down
2 changes: 1 addition & 1 deletion htdocs/assets/css/git.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ html,body,#commit .human .message a,#commit .human .actor .name a {
border-bottom:1px solid #bedce7;
border-left:1px solid #bedce7;
border-right:1px solid #bedce7;
background:#eaf2f5 url(/images/bg_gradient.gif) 0 100% repeat-x;
background:#eaf2f5 url(images/bg_gradient.gif) 0 100% repeat-x;
overflow:hidden;
padding:0 .7em .7em;
}
Expand Down
36 changes: 18 additions & 18 deletions htdocs/assets/css/jquery-ui/jquery-ui-1.8.16.custom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,26 +59,26 @@
.ui-widget { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1.1em; }
.ui-widget .ui-widget { font-size: 1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1em; }
.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(/images/jquery-ui/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; }
.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(images/jquery-ui/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; }
.ui-widget-content a { color: #333333; }
.ui-widget-header { border: 1px solid #e78f08; background: #f6a828 url(/images/jquery-ui/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
.ui-widget-header { border: 1px solid #e78f08; background: #f6a828 url(images/jquery-ui/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
.ui-widget-header a { color: #ffffff; }

/* Interaction states
----------------------------------*/
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(/images/jquery-ui/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; }
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(images/jquery-ui/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; }
.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url(/images/jquery-ui/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #c77405; }
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url(images/jquery-ui/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #c77405; }
.ui-state-hover a, .ui-state-hover a:hover { color: #c77405; text-decoration: none; }
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #fbd850; background: #ffffff url(/images/jquery-ui/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; }
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #fbd850; background: #ffffff url(images/jquery-ui/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; }
.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #eb8f00; text-decoration: none; }
.ui-widget :active { outline: none; }

/* Interaction Cues
----------------------------------*/
.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fed22f; background: #ffe45c url(/images/jquery-ui/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; color: #363636; }
.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fed22f; background: #ffe45c url(images/jquery-ui/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; color: #363636; }
.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(/images/jquery-ui/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; color: #ffffff; }
.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(images/jquery-ui/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; color: #ffffff; }
.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; }
.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; }
.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
Expand All @@ -89,14 +89,14 @@
----------------------------------*/

/* states and images */
.ui-icon { width: 16px; height: 16px; background-image: url(/images/jquery-ui/ui-icons_222222_256x240.png); }
.ui-widget-content .ui-icon {background-image: url(/images/jquery-ui/ui-icons_222222_256x240.png); }
.ui-widget-header .ui-icon {background-image: url(/images/jquery-ui/ui-icons_ffffff_256x240.png); }
.ui-state-default .ui-icon { background-image: url(/images/jquery-ui/ui-icons_ef8c08_256x240.png); }
.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(/images/jquery-ui/ui-icons_ef8c08_256x240.png); }
.ui-state-active .ui-icon {background-image: url(/images/jquery-ui/ui-icons_ef8c08_256x240.png); }
.ui-state-highlight .ui-icon {background-image: url(/images/jquery-ui/ui-icons_228ef1_256x240.png); }
.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(/images/jquery-ui/ui-icons_ffd27a_256x240.png); }
.ui-icon { width: 16px; height: 16px; background-image: url(images/jquery-ui/ui-icons_222222_256x240.png); }
.ui-widget-content .ui-icon {background-image: url(images/jquery-ui/ui-icons_222222_256x240.png); }
.ui-widget-header .ui-icon {background-image: url(images/jquery-ui/ui-icons_ffffff_256x240.png); }
.ui-state-default .ui-icon { background-image: url(images/jquery-ui/ui-icons_ef8c08_256x240.png); }
.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/jquery-ui/ui-icons_ef8c08_256x240.png); }
.ui-state-active .ui-icon {background-image: url(images/jquery-ui/ui-icons_ef8c08_256x240.png); }
.ui-state-highlight .ui-icon {background-image: url(images/jquery-ui/ui-icons_228ef1_256x240.png); }
.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/jquery-ui/ui-icons_ffd27a_256x240.png); }

/* positioning */
.ui-icon-carat-1-n { background-position: 0 0; }
Expand Down Expand Up @@ -286,8 +286,8 @@
.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }

/* Overlays */
.ui-widget-overlay { background: #666666 url(/images/jquery-ui/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; opacity: .50;filter:Alpha(Opacity=50); }
.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(/images/jquery-ui/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }/*
.ui-widget-overlay { background: #666666 url(images/jquery-ui/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; opacity: .50;filter:Alpha(Opacity=50); }
.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(images/jquery-ui/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }/*
* jQuery UI Resizable 1.8.16
*
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
Expand Down Expand Up @@ -565,4 +565,4 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
* http://docs.jquery.com/UI/Progressbar#theming
*/
.ui-progressbar { height:2em; text-align: left; }
.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
58 changes: 29 additions & 29 deletions htdocs/assets/css/modules/buttons-new.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.button-medium,
.button-large,
.button-fave{
background: url("/images/sprites/buttons-master.png") repeat-x scroll 0px -121px transparent;
background: url("images/sprites/buttons-master.png") repeat-x scroll 0px -121px transparent;
background-color: #1b9dbc;
position: relative;
font-size: 12px;
Expand Down Expand Up @@ -224,7 +224,7 @@ span.button-large-cart, a.button-large-cart{
padding: 0;
}
.button-large-cart span{
background: url("/images/sprites/buttons-master.png") no-repeat scroll 10px -233px transparent;
background: url("images/sprites/buttons-master.png") no-repeat scroll 10px -233px transparent;
}
.button-large-cart input, a.button-large-cart span{
padding: 0 14px 0 53px;
Expand Down Expand Up @@ -260,7 +260,7 @@ span.button-large-cart, a.button-large-cart{
box-shadow: 0 1px 0 #f4f4f4;
}
.button-fave span {
background: url("/images/sprites/buttons-master.png") no-repeat scroll 4px -438px transparent;
background: url("images/sprites/buttons-master.png") no-repeat scroll 4px -438px transparent;
padding: 0 9px 0 29px;
display: inline-block;
height: 23px;
Expand All @@ -269,7 +269,7 @@ span.button-large-cart, a.button-large-cart{
}
/* german language override */
.de .button-fave span {
background: url("/images/sprites/buttons-master.png") no-repeat scroll 3px -438px transparent;
background: url("images/sprites/buttons-master.png") no-repeat scroll 3px -438px transparent;
padding-right: 8px;
white-space: nowrap;
}
Expand All @@ -290,23 +290,23 @@ span.button-large-cart, a.button-large-cart{
}

.favorited-button span{
background: url("/images/sprites/buttons-master.png") no-repeat scroll 4px -466px transparent;
background: url("images/sprites/buttons-master.png") no-repeat scroll 4px -466px transparent;
}
/* german language override */
.de .favorited-button span{
background: url("/images/sprites/buttons-master.png") no-repeat scroll 3px -466px transparent;
background: url("images/sprites/buttons-master.png") no-repeat scroll 3px -466px transparent;
}

/*spinner*/
.favoriting,
.favoriting:hover,
.favoriting:active {
background: url("/images/sprites/buttons-master.png") repeat-x scroll 4px -354px #fbfaf8;
background: url("images/sprites/buttons-master.png") repeat-x scroll 4px -354px #fbfaf8;
}
.favoriting span,
.favoriting:hover span,
.favoriting:active span {
background: url("/images/sprites/buttons-master.png") repeat-x scroll 4px -354px #fbfaf8;
background: url("images/sprites/buttons-master.png") repeat-x scroll 4px -354px #fbfaf8;
}

.favoriting div.button-spinner {
Expand All @@ -319,7 +319,7 @@ span.button-large-cart, a.button-large-cart{
}

.favoriting div.show {
background: transparent url("/images/spinners/spinner16-trans.gif") no-repeat 0 0px;
background: transparent url("images/spinners/spinner16-trans.gif") no-repeat 0 0px;
}


Expand All @@ -328,7 +328,7 @@ span.button-large-cart, a.button-large-cart{
/*facebook*/

.button-fb span, .button-tw span{
background: url("/images/sprites/connected-accounts-sprite.png") no-repeat scroll 0 -89px transparent;
background: url("images/sprites/connected-accounts-sprite.png") no-repeat scroll 0 -89px transparent;
}

.button-fb.button-medium{
Expand Down Expand Up @@ -376,7 +376,7 @@ span.button-large-cart, a.button-large-cart{
--------------------------------- */
.button-stack {
margin-left: 4px;
background: transparent url("/images/sprites/buttons-favorite-master.png") no-repeat 0 -26px;
background: transparent url("images/sprites/buttons-favorite-master.png") no-repeat 0 -26px;
height: 26px;
line-height: 26px;
margin-bottom: 0px;
Expand All @@ -390,7 +390,7 @@ span.button-large-cart, a.button-large-cart{
position: relative;
}
.button-stack span {
background: transparent url("/images/sprites/buttons-favorite-master.png") no-repeat right 0px;
background: transparent url("images/sprites/buttons-favorite-master.png") no-repeat right 0px;
display: inline-block;
height: 26px;
line-height: 26px;
Expand Down Expand Up @@ -438,7 +438,7 @@ span.button-large-cart, a.button-large-cart{
}

.button-circle {
background: transparent url("/images/sprites/buttons-favorite-master.png") no-repeat 0 -234px;
background: transparent url("images/sprites/buttons-favorite-master.png") no-repeat 0 -234px;
height: 26px;
line-height: 26px;
margin-bottom: 0px;
Expand All @@ -451,7 +451,7 @@ span.button-large-cart, a.button-large-cart{
position: relative;
}
.button-circle span {
background: transparent url("/images/sprites/buttons-favorite-master.png") no-repeat right 0px;
background: transparent url("images/sprites/buttons-favorite-master.png") no-repeat right 0px;
display: inline-block;
height: 26px;
line-height: 26px;
Expand Down Expand Up @@ -543,21 +543,21 @@ span.button-large-cart, a.button-large-cart{
}
.add-to-circle-spinner{
padding-right: 24px;
background: url('/images/spinners/spinner16.gif') no-repeat right 5px transparent;
background: url('images/spinners/spinner16.gif') no-repeat right 5px transparent;
float: left;
display: none;
height: 26px;
}
.add-to-circle-spinner.tan{
background: url('/images/spinners/spinner16-tan.gif') no-repeat right 5px transparent;
background: url('images/spinners/spinner16-tan.gif') no-repeat right 5px transparent;
}

.add-to-circle-spinner.blue{
background: url('/images/spinners/spinner16-blue.gif') no-repeat right 5px transparent;
background: url('images/spinners/spinner16-blue.gif') no-repeat right 5px transparent;
}

.add-to-circle-spinner.blue-darker{
background: url('/images/spinners/spinner16-blue-darker.gif') no-repeat right 5px transparent;
background: url('images/spinners/spinner16-blue-darker.gif') no-repeat right 5px transparent;
}

/* The new add to circle button can be mirrored as well */
Expand All @@ -584,7 +584,7 @@ span.button-large-cart, a.button-large-cart{
}
.tt-add-circle.tt.tt-mini .dismiss{
position: absolute; right: 0; top: 1px;
background: transparent url('/images/sprites/buttons-master.png') no-repeat -64px -1326px;
background: transparent url('images/sprites/buttons-master.png') no-repeat -64px -1326px;
display: block;
width: 16px;
height: 16px;
Expand All @@ -605,15 +605,15 @@ span.button-large-cart, a.button-large-cart{
input.button-remove,
button.button-remove,
.button-remove.button-remove-quiet:hover {
background: transparent url("/images/sprites/buttons-master.png") no-repeat 0 -1326px;
background: transparent url("images/sprites/buttons-master.png") no-repeat 0 -1326px;
display: block;
width: 16px;
height: 16px;
}
* html .button-remove,
* html input.button-remove,
* html button.button-remove {
background: transparent url("/images/sprites/buttons-master.png") no-repeat 0 -1326px;
background: transparent url("images/sprites/buttons-master.png") no-repeat 0 -1326px;
}

.button-remove span {
Expand Down Expand Up @@ -652,7 +652,7 @@ button.button-remove,
.button-edit,
input.button-edit,
button.button-edit {
background: url("/images/sprites/buttons-master.png") no-repeat scroll 0 -1358px transparent;
background: url("images/sprites/buttons-master.png") no-repeat scroll 0 -1358px transparent;
height: 16px;
width: 16px;
}
Expand Down Expand Up @@ -688,28 +688,28 @@ button.button-edit {
/* Add Button
----------------------------------*/
.button-add {
background: transparent url("/images/sprites/buttons-master.png") no-repeat 0 -1244px;
background: transparent url("images/sprites/buttons-master.png") no-repeat 0 -1244px;
display: block;
width: 28px;
height: 28px;
text-indent:-999em;
}
* html .button-add {
background: transparent url("/images/sprites/buttons-master.png") no-repeat 0 -1244px;
background: transparent url("images/sprites/buttons-master.png") no-repeat 0 -1244px;
}

/* Favorite Button
--------------------------------- */
.button-favorite,
.button-favorite.button-favorite-quiet:hover {
background: transparent url("/images/sprites/buttons-master.png") no-repeat 0 -1342px;
background: transparent url("images/sprites/buttons-master.png") no-repeat 0 -1342px;
display: block;
margin-top:-1px;
width: 16px;
height: 16px;
}
* html .button-favorite {
background: transparent url("/images/sprites/buttons-master.png") no-repeat 0 -1342px;
background: transparent url("images/sprites/buttons-master.png") no-repeat 0 -1342px;
}

.button-favorite.button-favorite-quiet {
Expand Down Expand Up @@ -777,13 +777,13 @@ ul.listings-listview a.button-favorite {
--------------------------------- */
.button-contact,
.button-contact.button-contact-quiet:hover {
background: transparent url("/images/sprites/buttons-master.png") no-repeat 0 -1422px;
background: transparent url("images/sprites/buttons-master.png") no-repeat 0 -1422px;
display: block;
width: 16px;
height: 16px;
}
* html .button-contact {
background: transparent url("/images/sprites/buttons-master.png") no-repeat 0 -1422px;
background: transparent url("images/sprites/buttons-master.png") no-repeat 0 -1422px;
}

.button-contact.button-contact-quiet {
Expand All @@ -805,7 +805,7 @@ ul.listings-listview a.button-favorite {
.js-checkbox {
width: 14px;
height: 15px;
background-image: url('/images/sprites/buttons-master.png');
background-image: url('images/sprites/buttons-master.png');
background-position: 0 -1194px;
display: inline-block;
}
Expand Down
2 changes: 1 addition & 1 deletion htdocs/assets/css/shop-metrics.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ div.event-info {
float: right;
width: 14px;
height: 14px;
background: url('/images/edit-icon.gif') no-repeat;
background: url('images/edit-icon.gif') no-repeat;
opacity: .25;
}

Expand Down
4 changes: 2 additions & 2 deletions htdocs/assets/css/style.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "/assets/css/definitions.less";
@import "/assets/css/vendor/fluid.gs.css";
@import "assets/css/definitions.less";
@import "assets/css/vendor/fluid.gs.css";

html {
background-color: #333;
Expand Down
Loading