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

Commit

Permalink
Conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewmbacon committed Aug 7, 2014
2 parents 649636e + 6c44314 commit 0c4b420
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 26 deletions.
4 changes: 4 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

*.xml

*.xml
2 changes: 1 addition & 1 deletion _notes/dwsync.xml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name="functions.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3490267323" remote="7785234637" Dst="-1" /><file name="README.md" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3486550966" remote="602446763927119303" Dst="-1" /><file name="style.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3490214850" remote="602446763928351686" Dst="-1" /><file name="screenshot.jpg" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3490090979" remote="602446763928227841" Dst="-1" /></dwsync>
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name="functions.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3490267323" remote="7785234637" Dst="-1" /><file name="README.md" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3486550966" remote="602446763927119303" Dst="-1" /><file name="style.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3490278584" remote="602446763928415417" Dst="-1" /><file name="screenshot.jpg" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3490090979" remote="602446763928227841" Dst="-1" /></dwsync>
Expand Down
6 changes: 5 additions & 1 deletion sass/_notes/dwsync.xml
View file
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name=".DS_Store" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3488270130" remote="-4611742485168413241" Dst="-1" /><file name="variables.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3490019914" remote="-4611742485167304703" Dst="-1" /></dwsync>
<<<<<<< HEAD
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name=".DS_Store" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3488270130" remote="-4611742485168413241" Dst="-1" /><file name="variables.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3490019914" remote="-4611742485167304703" Dst="-1" /></dwsync>
=======
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name="style.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3490020080" remote="-4611742485167304703" Dst="-1" /><file name="variables.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3490019914" remote="-4611742485167304703" Dst="-1" /><file name="style.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/" local="3490277027" remote="319783739134142127" Dst="-1" /></dwsync>
>>>>>>> 6c44314c017c92900781edde52c5764521ad5683
Expand Down
37 changes: 30 additions & 7 deletions style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7421,6 +7421,11 @@ object {
.widget.widget_rcpt ul .rcpt_item_date {
margin: .5em 5% 1em;
}
.widget.widget_sp_image {
padding: 0;
border: none;
background-color: transparent;
}
.widget.widget_metaslider_widget {
padding: 0;
background-color: transparent;
Expand Down Expand Up @@ -7979,12 +7984,23 @@ body {
padding-top: 0.3em !important;
}

.widget.uc-ecw .uc-cal.uc-iconcal .uc-cal-list a.uc-cal-event .uc-cal-event-date {
border: 1px solid #e5e5e5;
}

.widget.uc-ecw .uc-cal.uc-iconcal .uc-cal-list a.uc-cal-event .uc-cal-event-date .uc-cal-event-day {
font-size: 1.7em;
padding-bottom: 0.2em;
margin-top: -3px;
color: #777777;
}

#main {
border: 1px solid #eee;
}

#content .page {
padding-top: 30px;
padding-top: 0px;
padding-bottom: 4em;
}
#content .page h1 {
Expand All @@ -7998,7 +8014,7 @@ body {
margin-top: 20px;
}
#content .page h2 {
margin-top: 2.5em;
margin-top: 1.5em;
margin-bottom: 1em;
}
#content .page h1 + h2 {
Expand All @@ -8009,10 +8025,13 @@ body {
font-weight: bold;
color: #4C608A;
}

.col-sm-12 .page {
padding-left: 4em;
padding-right: 4em;
#content .col-sm-12 .page {
padding-left: 6em;
padding-right: 6em;
}
#content .col-sm-9 .page {
padding-left: 3em;
padding-right: 3em;
}

@media (max-width: 767px) {
Expand All @@ -8022,7 +8041,7 @@ body {
}
}
#page-home {
padding-top: 30px;
padding-top: 15px;
}
#page-home .widget .col-xs-1, #page-home .col-sm-1, #page-home .col-md-1, #page-home .col-lg-1, #page-home .col-xs-2, #page-home .col-sm-2, #page-home .col-md-2, #page-home .col-lg-2, #page-home .col-xs-3, #page-home .col-sm-3, #page-home .col-md-3, #page-home .col-lg-3, #page-home .col-xs-4, #page-home .col-sm-4, #page-home .col-md-4, #page-home .col-lg-4, #page-home .col-xs-5, #page-home .col-sm-5, #page-home .col-md-5, #page-home .col-lg-5, #page-home .col-xs-6, #page-home .col-sm-6, #page-home .col-md-6, #page-home .col-lg-6, #page-home .col-xs-7, #page-home .col-sm-7, #page-home .col-md-7, #page-home .col-lg-7, #page-home .col-xs-8, #page-home .col-sm-8, #page-home .col-md-8, #page-home .col-lg-8, #page-home .col-xs-9, #page-home .col-sm-9, #page-home .col-md-9, #page-home .col-lg-9, #page-home .col-xs-10, #page-home .col-sm-10, #page-home .col-md-10, #page-home .col-lg-10, #page-home .col-xs-11, #page-home .col-sm-11, #page-home .col-md-11, #page-home .col-lg-11, #page-home .col-xs-12, #page-home .col-sm-12, #page-home .col-md-12, #page-home .col-lg-12 {
padding-left: 5px;
Expand All @@ -8043,3 +8062,7 @@ body {
#mega-footer + #footer {
border-top: none;
}

.form-control {
border-right: none;
}
54 changes: 37 additions & 17 deletions style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ body {
color:$title_txt;

&:hover {
color:$title_txtHover;
color:$title_txtHover;
}
}

Expand Down Expand Up @@ -161,6 +161,16 @@ body {
.uc-cal-event-day {
padding-top:.3em!important;
}
.widget.uc-ecw .uc-cal.uc-iconcal .uc-cal-list a.uc-cal-event .uc-cal-event-date {
border:1px solid #e5e5e5;

}
.widget.uc-ecw .uc-cal.uc-iconcal .uc-cal-list a.uc-cal-event .uc-cal-event-date .uc-cal-event-day {
font-size:1.7em;
padding-bottom:0.2em;
margin-top:-3px;
color:#777777;
}



Expand All @@ -170,7 +180,7 @@ body {

#content {
.page {
padding-top:30px;
padding-top:0px;
padding-bottom:4em;

h1 {
Expand All @@ -184,7 +194,7 @@ body {
margin-top:20px;
}
h2 {
margin-top:2.5em;
margin-top:1.5em;
margin-bottom:1em;
}
h1 + h2 {
Expand All @@ -198,10 +208,15 @@ body {
}

}
}
.col-sm-12 .page {
padding-left:4em;
padding-right:4em;

.col-sm-12 .page {
padding-left:6em;
padding-right:6em;
}
.col-sm-9 .page {
padding-left:3em;
padding-right:3em;
}
}
@media (max-width: 767px) {
#content .page {
Expand All @@ -212,23 +227,24 @@ body {


#page-home {
padding-top:30px;


padding-top:15px;

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

.row {

margin-left: -5px;
margin-right: -5px;
}
margin-left:-5px;
margin-right:-5px;

}
.widget {
margin:0 0 10px;
margin: 0 0 10px;

}


}

Expand All @@ -240,3 +256,7 @@ body {
border-top:none;
}


.form-control {
border-right:none;
}

0 comments on commit 0c4b420

Please sign in to comment.