From: Laury GvR Date: Mon, 19 Oct 2015 20:36:16 +0000 (-0400) Subject: Add new tripadvisor. Repositioning everything in the footer to make it fit.. X-Git-Tag: V1.3.7^2 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=812b667f17bfa525c62a27f26e38f35e649618d9;p=web%2FKeweenaw.git Add new tripadvisor. Repositioning everything in the footer to make it fit.. --- diff --git a/config/server.ini b/config/server.ini index fd3cc87..bcb180b 100644 --- a/config/server.ini +++ b/config/server.ini @@ -172,8 +172,8 @@ mobile.hostname = Off google.search.key = "ABQIAAAANX0yQZ2OteLu_zqbwdfUuRTeX7yNUukyMrmY8FsCXcCA9axlYBTyhehgzuXOUfNI0E5UYHCLponA0A" google.maps.key = "ABQIAAAANX0yQZ2OteLu_zqbwdfUuRQsHGkczIjpqPY1-dTKNoaiGtfPJBTloI-YH7fzUV-bsMLwcy2Yjyti7A" -app.base_url = "http://app.gaslightmedia.com/" -app.base_secure_url = "https://app.gaslightmedia.com/" +app.base_url = "http://localhost:8080/app.gaslightmedia.com/" +app.base_secure_url = "http://localhost:8080/app.gaslightmedia.com/" error.reporting[] = E_ALL error.reporting[] = E_NOTICE @@ -181,7 +181,7 @@ error.display = 1 error.ident = "" error.conf.path = "/var/www/server/" -database.params.host = "localhost" +database.params.host = "devdb" development = On diff --git a/sass/_custom.scss b/sass/_custom.scss index 3a9d345..7d6f300 100644 --- a/sass/_custom.scss +++ b/sass/_custom.scss @@ -609,7 +609,7 @@ footer { a {color: $orange} background-color: $burgundy; padding-bottom: 10px; - img { + .adventure-guide img { height: 87px; } > .columns { diff --git a/styles.css b/styles.css index ef662c5..91a9f8f 100644 --- a/styles.css +++ b/styles.css @@ -960,7 +960,9 @@ footer a { color: #f27225; } footer img { - height: 87px; + .adventure-guide img { + height: 87px; + } } footer > .columns { padding: 20px !important; @@ -1028,7 +1030,6 @@ footer .contact li, footer .copyright li { } footer .weather > div { display: inline-block; - float: none !important; } } footer .copyright .separator { @@ -1068,21 +1069,21 @@ footer .copyright .separator { /*Weather*/ #glm-weather { + background-color: #fff; color: black; display: block; - width: 185px; - height: 80px; - background-color: #fff; font-size: 12px; - text-align: center; + height: 86px; line-height: 180%; + padding: 0; + text-align: center; + width: 120px; } #glm-weather img { + float: left; height: 48px; + margin-left: 8px; width: 48px; - float: left; - margin: 8px; - padding-top:8px; } #glm-weather .glm-weatherHdr { padding-top: 5px; @@ -1092,6 +1093,12 @@ footer .copyright .separator { #glm-weather .glm-weatherTmp { font-size: 20px; } +.TA_excellent { + float: left; +} +.TA_excellent #CDSWIDEXC { + margin: 0; +} /*Reset stuff*/ #main b, strong { font-weight: bold; diff --git a/templates/template.html b/templates/template.html index 4f81dcc..3fed695 100755 --- a/templates/template.html +++ b/templates/template.html @@ -239,7 +239,7 @@ -
+
{if:video} {video:h}
@@ -248,10 +248,11 @@ {end:}
-
+
+
-

Current Weather

+

{tempF}°

{weather}