Skip to content

Commit

Permalink
Merge remote-tracking branch 'Prosk8er/ticket/11801' into develop-oly…
Browse files Browse the repository at this point in the history
…mpus

* Prosk8er/ticket/11801:
  [ticket/11801] removed some whitespace and added missing semi colon's in css
  • Loading branch information
bantu committed Aug 19, 2013
2 parents 78f1e11 + f61db86 commit 8c69db6
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
32 changes: 16 additions & 16 deletions phpBB/styles/prosilver/theme/colours.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
--------------------------------------------------------------
Colours and backgrounds for common.css
-------------------------------------------------------------- */
Expand Down Expand Up @@ -81,7 +81,7 @@ hr.dashed {
}

.bg1 { background-color: #ECF3F7; }
.bg2 { background-color: #e1ebf2; }
.bg2 { background-color: #e1ebf2; }
.bg3 { background-color: #cadceb; }

.ucprowbg {
Expand Down Expand Up @@ -234,7 +234,7 @@ p.rules {
background-image: none;
}

/*
/*
--------------------------------------------------------------
Colours and backgrounds for links.css
-------------------------------------------------------------- */
Expand Down Expand Up @@ -327,7 +327,7 @@ a.topictitle:active {
color: #105289;
}

/* Profile searchresults */
/* Profile searchresults */
.search .postprofile a {
color: #105289;
}
Expand All @@ -346,10 +346,10 @@ a.top2 {
}

/* Arrow links */
a.up { background-image: url("{T_THEME_PATH}/images/arrow_up.gif") }
a.down { background-image: url("{T_THEME_PATH}/images/arrow_down.gif") }
a.left { background-image: url("{T_THEME_PATH}/images/arrow_left.gif") }
a.right { background-image: url("{T_THEME_PATH}/images/arrow_right.gif") }
a.up { background-image: url("{T_THEME_PATH}/images/arrow_up.gif"); }
a.down { background-image: url("{T_THEME_PATH}/images/arrow_down.gif"); }
a.left { background-image: url("{T_THEME_PATH}/images/arrow_left.gif"); }
a.right { background-image: url("{T_THEME_PATH}/images/arrow_right.gif"); }

a.up:hover {
background-color: transparent;
Expand All @@ -364,7 +364,7 @@ a.right:hover {
}


/*
/*
--------------------------------------------------------------
Colours and backgrounds for content.css
-------------------------------------------------------------- */
Expand Down Expand Up @@ -655,7 +655,7 @@ fieldset.polls dd div {
background-image: url("{IMG_ICON_USER_ONLINE_SRC}");
}

/*
/*
--------------------------------------------------------------
Colours and backgrounds for buttons.css
-------------------------------------------------------------- */
Expand All @@ -664,9 +664,9 @@ Colours and backgrounds for buttons.css
.reply-icon span { background-image: url("{IMG_BUTTON_TOPIC_REPLY_SRC}"); }
.post-icon span { background-image: url("{IMG_BUTTON_TOPIC_NEW_SRC}"); }
.locked-icon span { background-image: url("{IMG_BUTTON_TOPIC_LOCKED_SRC}"); }
.pmreply-icon span { background-image: url("{IMG_BUTTON_PM_REPLY_SRC}") ;}
.newpm-icon span { background-image: url("{IMG_BUTTON_PM_NEW_SRC}") ;}
.forwardpm-icon span { background-image: url("{IMG_BUTTON_PM_FORWARD_SRC}") ;}
.pmreply-icon span { background-image: url("{IMG_BUTTON_PM_REPLY_SRC}"); }
.newpm-icon span { background-image: url("{IMG_BUTTON_PM_NEW_SRC}"); }
.forwardpm-icon span { background-image: url("{IMG_BUTTON_PM_FORWARD_SRC}"); }

a.print {
background-image: url("{T_THEME_PATH}/images/icon_print.gif");
Expand Down Expand Up @@ -714,7 +714,7 @@ a.fontsize {
.info-icon, .info-icon a { background-image: url("{IMG_ICON_POST_INFO_SRC}"); }
.warn-icon, .warn-icon a { background-image: url("{IMG_ICON_USER_WARN_SRC}"); } /* Need updated warn icon */

/*
/*
--------------------------------------------------------------
Colours and backgrounds for cp.css
-------------------------------------------------------------- */
Expand Down Expand Up @@ -916,7 +916,7 @@ dl.mini dt {
background-color: #EEE;
}

/*
/*
--------------------------------------------------------------
Colours and backgrounds for forms.css
-------------------------------------------------------------- */
Expand Down Expand Up @@ -967,7 +967,7 @@ fieldset.quick-login input.inputbox {
/* Input field styles
---------------------------------------- */
.inputbox {
background-color: #FFFFFF;
background-color: #FFFFFF;
border-color: #B4BAC0;
color: #333333;
}
Expand Down
4 changes: 2 additions & 2 deletions phpBB/styles/subsilver2/theme/stylesheet.css
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ p.datetime {
p.searchbar {
padding: 2px 0;
white-space: nowrap;
}
}

p.searchbarreg {
margin: 0;
Expand Down Expand Up @@ -463,7 +463,7 @@ textarea {
background-color: #FAFAFA;
color: #333333;
font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
font-size: 1.3em;
font-size: 1.3em;
line-height: 1.4em;
font-weight: normal;
border: 1px solid #A9B8C2;
Expand Down

0 comments on commit 8c69db6

Please sign in to comment.