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

Fix for In-Page Padding #23

Merged
merged 1 commit into from
Oct 15, 2014
+111 −76
Merged

Fix for In-Page Padding #23

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
163 changes: 91 additions & 72 deletions style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
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 @@ -6819,10 +6813,6 @@ button.close {
width: 150px;
}

.lte7.form-control {
width: 20px;
}

/* NAV
--------------------------------------------------------------*/
#nav-secondary {
Expand Down Expand Up @@ -6869,6 +6859,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 @@ -7064,15 +7111,9 @@ code {
margin: 1em;
}
.page .uc-cal.uc-listcal .uc-cal-list a.uc-cal-event {
display: block;
position: relative;
padding-left: 3em;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
}
.page .uc-cal.uc-listcal .uc-cal-list a.uc-cal-event .uc-cal-event-date {
position: absolute;
left: 0;
top: 0;
display: block;
font-weight: normal;
color: #aaa;
Expand Down Expand Up @@ -7444,12 +7485,6 @@ object {
.widget.uc-contact-widget th {
white-space: nowrap;
}
.widget.uc-contact-widget td.uc-output-email {
word-break: break-all;
}
.widget.uc-contact-widget td.uc-output-more {
word-break: break-all;
}
.widget.uc-ecw {
padding-bottom: 1em;
}
Expand Down Expand Up @@ -7509,15 +7544,9 @@ object {
margin: 1em;
}
.widget.uc-ecw .uc-cal.uc-listcal .uc-cal-list a.uc-cal-event {
display: block;
position: relative;
padding-left: 3em;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
}
.widget.uc-ecw .uc-cal.uc-listcal .uc-cal-list a.uc-cal-event .uc-cal-event-date {
position: absolute;
left: 0;
top: 0;
display: block;
font-weight: normal;
color: #aaa;
Expand Down Expand Up @@ -7661,76 +7690,57 @@ q:before, table q:after {
display: block;
position: relative;
padding-left: 170px;
min-height: 150px;
}
.uup-list .has-image .uup-thumbnail {
display: block;
width: 150px;
height: 150px;
position: absolute;
left: 0;
top: 0;
float: left;
position: relative;
left: -170px;
margin-right: -150px;
}
.uup-list a.uup-user {
float: left;
}
.uup-list .uup-item {
margin-bottom: 1em;
*zoom: 1;
}
.uup-list .uup-item:after, .uup-list .uup-item:before {
content: '';
display: table;
}
.uup-list .uup-item:after {
clear: both;
}
.uup-list .uup-item .uup-text {
display: block;
}
.uup-list .uup-item .uup-text > span {
display: block;
}
.uup-list .uup-item .uup-text a .uup-name {
display: inline;
}
.uup-list .uup-item .uup-text .uup-name {
font-weight: bold;
}
.uup-list .uup-item .uup-text .uup-name .uup-first:after {
.uup-list .uup-item .uup-text .uup-name .uup-last:before {
content: ' ';
}

.uup-index-table .uup-table-name.table-has-image {
position: relative;
padding-left: 60px;
}
.uup-index-table .uup-table-name.table-has-image .uup-table-thumbnail {
display: block;
width: 50px;
height: 50px;
position: absolute;
left: 0;
top: 5px;
width: 75px;
float: left;
margin: 0 1em 1em 0 !important;
}
.uup-index-table .uup-table-name.table-has-image .uup-name {
float: left;
display: block;
}
.uup-index-table .uup-table-name .uup-last:before {
content: ' ';
}

/*
Profile Page
*/
.page-template-page-user-profile-php .uup-user {
padding: 1em;
}
.page-template-page-user-profile-php .uup-user > span {
display: block;
}
.page-template-page-user-profile-php .uup-user .uup-image {
margin-bottom: 1em;
}
.page-template-page-user-profile-php .uup-user .uup-name {
font-weight: bold;
}
.page-template-page-user-profile-php .uup-user .uup-name .uup-first:after {
content: ' ';
}
.page-template-page-user-profile-php .uup-user .uup-phones .uup-phone2 {
display: block;
}

/* - - - - - - - - - - - - - - - - - - -
== Calendar
- - - - - - - - - - - - - - - - - - - */
Expand Down Expand Up @@ -8185,9 +8195,18 @@ body {
margin: 0 0 10px;
}

.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: 5px;
padding-right: 5px;
.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;
}

#content .col-sm-12 .page {
padding-left: 2em;
padding-right: 2em;
}

#page-home {
Expand Down
24 changes: 20 additions & 4 deletions style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,12 +339,28 @@ body {
margin:0 0 10px;
}

.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 {


.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;
}

padding-left:5px;
padding-right:5px;
}
.entry-header {
padding-left:15px;
padding-right:15px;

}

}

#content .col-sm-12 .page {
padding-left:2em;
padding-right:2em;
}

#page-home {

Expand Down