Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #24 from bcd04001/master 
Bug List Updates
  • Loading branch information
@amb00010
amb00010 committed Oct 27, 2014
2 parents d5f90be + 34d902d commit 16cec66
Show file tree
Hide file tree
Showing 2 changed files with 129 additions and 29 deletions.
129 changes: 104 additions & 25 deletions style.css
View file
Expand Up @@ -328,7 +328,6 @@ th {
src: url("../../global/bootstrap-sass-master/assets/fonts/bootstrap/glyphicons-halflings-regular.eot");
src: url("../../global/bootstrap-sass-master/assets/fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"), url("../../global/bootstrap-sass-master/assets/fonts/bootstrap/glyphicons-halflings-regular.woff") format("woff"), url("../../global/bootstrap-sass-master/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf") format("truetype"), url("../../global/bootstrap-sass-master/assets/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg");
}

.glyphicon {
position: relative;
top: 1px;
Expand Down Expand Up @@ -1156,7 +1155,7 @@ th {

html {
font-size: 10px;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-webkit-tap-highlight-color: transparent;
}

body {
Expand Down Expand Up @@ -5146,7 +5145,6 @@ a.thumbnail.active {
background-position: 0 0;
}
}

@keyframes progress-bar-stripes {
from {
background-position: 40px 0;
Expand All @@ -5156,7 +5154,6 @@ a.thumbnail.active {
background-position: 0 0;
}
}

.progress {
overflow: hidden;
height: 20px;
Expand Down Expand Up @@ -6366,7 +6363,7 @@ button.close {
border-radius: 10px;
cursor: pointer;
background-color: #000 \9;
background-color: rgba(0, 0, 0, 0);
background-color: transparent;
}
.carousel-indicators .active {
margin: 0;
Expand Down Expand Up @@ -6476,7 +6473,6 @@ button.close {
@-ms-viewport {
width: device-width;
}

.visible-xs, .visible-sm, .visible-md, .visible-lg {
display: none !important;
}
Expand Down Expand Up @@ -6734,15 +6730,13 @@ button.close {
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Proxima Nova';
src: url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot");
src: url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot?#iefix") format("embedded-opentype"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.svg#proxima_nova_ltsemibold") format("svg"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.woff") format("woff"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.ttf") format("truetype");
font-weight: 500;
font-style: normal;
}

/* - - - - - - - - - - - - - - - - - - -
== Titlebar
- - - - - - - - - - - - - - - - - - - */
Expand Down Expand Up @@ -6869,6 +6863,63 @@ button.close {
display: none;
}

/*
// Support for mulitple-level dropdown menus.
.dropdown-submenu{
position:relative;
}
.dropdown-submenu > .dropdown-menu {
top:0;
left:100%;
padding:0;
}
.dropdown-submenu:hover > .dropdown-menu{
display:block;
}
.dropdown-submenu:hover > a {
color: $navbar-default-link-hover-color;
background-color: $navbar-default-link-hover-bg;
}
.dropdown-submenu > a:after{
display:block;
content:" ";
float:right;
width:0;
height:0;
border-color:transparent;
border-style:solid;
border-width:5px 0 5px 5px;
border-left-color:$navbar-default-link-color;
margin-top:5px;
margin-right:-10px;
}
.dropdown-submenu:hover > a:after{
border-left-color:$navbar-default-link-hover-color;
}
.dropdown-submenu .pull-left{
float:none;
}
.dropdown-submenu.pull-left > .dropdown-menu{
left:-100%;
margin-left:10px;
}
.dropdown-menu {
.dropdown-menu {
margin:0;
top:-1px;
}
}
/**/
.navbar-collapse {
max-height: none;
}
Expand Down Expand Up @@ -8085,8 +8136,23 @@ body {
#main {
border: 1px solid #eee;
border-top: none;
padding-left: 3em;
padding-right: 3em;
}
#main .post {
padding: 1em 0em;
}

#content {
/* .col-sm-12 .page {
padding-left:3em;
padding-right:3em;
}
.col-sm-9 .page {
padding-left:3em;
padding-right:3em;
} */
}
#content .page {
padding-top: 0px;
padding-bottom: 4em;
Expand Down Expand Up @@ -8116,14 +8182,6 @@ body {
#content #page-archive .entry-header .page-title {
padding-left: 0.57em;
}
#content .col-sm-12 .page {
padding-left: 3em;
padding-right: 3em;
}
#content .col-sm-9 .page {
padding-left: 3em;
padding-right: 3em;
}
#content #page-blank .page {
padding-left: 0;
padding-right: 0;
Expand Down Expand Up @@ -8153,6 +8211,10 @@ body {
border-right: 1px solid #cccccc;
}

#comments .form-control {
border-right: 1px solid #cccccc;
}

#site-title .searchform .form-group .form-control {
font-size: 12px;
}
Expand Down Expand Up @@ -8185,20 +8247,29 @@ body {
margin: 0 0 10px;
}

.page .col-xs-1, .page .col-sm-1, .page .col-md-1, .page .col-lg-1, .page .col-xs-2, .page .col-sm-2, .page .col-md-2, .page .col-lg-2, .page .col-xs-3, .page .col-sm-3, .page .col-md-3, .page .col-lg-3, .page .col-xs-4, .page .col-sm-4, .page .col-md-4, .page .col-lg-4, .page .col-xs-5, .page .col-sm-5, .page .col-md-5, .page .col-lg-5, .page .col-xs-6, .page .col-sm-6, .page .col-md-6, .page .col-lg-6, .page .col-xs-7, .page .col-sm-7, .page .col-md-7, .page .col-lg-7, .page .col-xs-8, .page .col-sm-8, .page .col-md-8, .page .col-lg-8, .page .col-xs-9, .page .col-sm-9, .page .col-md-9, .page .col-lg-9, .page .col-xs-10, .page .col-sm-10, .page .col-md-10, .page .col-lg-10, .page .col-xs-11, .page .col-sm-11, .page .col-md-11, .page .col-lg-11, .page .col-xs-12, .page .col-sm-12, .page .col-md-12, .page .col-lg-12 {
padding-left: 15px;
padding-right: 15px;
}
.page .entry-header {
padding-left: 15px;
padding-right: 15px;
/*
.page {
.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
padding-left:15px;
padding-right:15px;
}
.entry-header {
padding-left:15px;
padding-right:15px;
}
}
#content .col-sm-12 .page {
padding-left: 2em;
padding-right: 2em;
padding-left:2em;
padding-right:2em;
}
*/
#page-home {
padding-top: 15px;
}
Expand All @@ -8214,6 +8285,10 @@ body {
margin: 0 0 10px;
}

#nav-secondary {
border-color: #eee;
}

#mega-footer, #footer {
border-top: 1px solid #233e75;
}
Expand Down Expand Up @@ -8273,3 +8348,7 @@ table .external .glyphicon-new-window {
.page-template-page-user-profile-php .uup-user .uup-phones .uup-phone2 {
display: block;
}

.uup-list a.uup-user {
float: none;
}
29 changes: 25 additions & 4 deletions style.scss
View file
Expand Up @@ -226,6 +226,13 @@ body {
#main {
border:1px solid #eee;
border-top:none;
padding-left:3em;
padding-right:3em;

.post {
padding:1em 0em;

}
}

#content {
Expand Down Expand Up @@ -266,14 +273,14 @@ body {
}
}

.col-sm-12 .page {
/* .col-sm-12 .page {
padding-left:3em;
padding-right:3em;
}
.col-sm-9 .page {
padding-left:3em;
padding-right:3em;
}
} */
#page-blank {
.page {
padding-left:0;
Expand Down Expand Up @@ -306,6 +313,10 @@ body {
.comment-form-comment .form-control {
border-right:1px solid #cccccc;
}

#comments .form-control {
border-right:1px solid #cccccc;
}

#site-title .searchform .form-group .form-control {
font-size:12px;
Expand Down Expand Up @@ -340,7 +351,7 @@ body {
}



/*
.page {
.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
Expand All @@ -362,6 +373,7 @@ body {
padding-right:2em;
}
*/
#page-home {

padding-top:15px;
Expand All @@ -380,6 +392,9 @@ body {
}
}

#nav-secondary {
border-color:#eee;
}

#mega-footer, #footer {
border-top:1px solid #233e75;
Expand Down Expand Up @@ -432,6 +447,7 @@ table .external .glyphicon-new-window {
Profile Page
*/
.page-template-page-user-profile-php {

.uup-user {
padding: 2em;
& > span {
Expand Down Expand Up @@ -469,4 +485,9 @@ table .external .glyphicon-new-window {
.uup-mailing-address {
}
}
}
}

.uup-list a.uup-user {
float:none;
}

0 comments on commit 16cec66

Please sign in to comment.