aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/cobrands/fixmybarangay/_colours.scss2
-rw-r--r--web/cobrands/fixmybarangay/base.scss40
-rw-r--r--web/cobrands/fixmybarangay/images/city6.pngbin0 -> 227275 bytes
-rw-r--r--web/cobrands/fixmybarangay/images/city7.pngbin0 -> 126124 bytes
-rw-r--r--web/cobrands/fixmybarangay/images/ie_logo.pngbin3559 -> 2143 bytes
-rw-r--r--web/cobrands/fixmybarangay/images/pat3.pngbin0 -> 3028 bytes
-rw-r--r--web/cobrands/fixmybarangay/images/sprite.pngbin125210 -> 17752 bytes
-rw-r--r--web/cobrands/fixmybarangay/layout.scss81
-rw-r--r--web/cobrands/fixmybarangay/message_manager.scss212
9 files changed, 217 insertions, 118 deletions
diff --git a/web/cobrands/fixmybarangay/_colours.scss b/web/cobrands/fixmybarangay/_colours.scss
index fdc43f360..fcaba8924 100644
--- a/web/cobrands/fixmybarangay/_colours.scss
+++ b/web/cobrands/fixmybarangay/_colours.scss
@@ -1,6 +1,6 @@
/* COLOURS */
-$primary: #ffff99;
+$primary: #fff; //E6DBD6
$primary_b: #000000;
$primary_text: #222222;
diff --git a/web/cobrands/fixmybarangay/base.scss b/web/cobrands/fixmybarangay/base.scss
index 2963d2454..71c2d8205 100644
--- a/web/cobrands/fixmybarangay/base.scss
+++ b/web/cobrands/fixmybarangay/base.scss
@@ -7,14 +7,11 @@
#site-logo{
width: 225px !important;
- background: url('/cobrands/fixmybarangay/images/sprite.png') -3px -3px no-repeat;
-}
-.ie6 #site-logo {
- background: url('/cobrands/fixmybarangay/images/ie_logo.gif') 0 -5px no-repeat;
+ background: url('images/sprite.png') -3px -3px no-repeat;
}
-.ie6 body.frontpage #site-logo {
- background:url(/cobrands/fixmybarangay/images/ie_front_logo.gif) 0 0 no-repeat;
+#barangay_buttons {
+ padding: 1em;
}
.yellow-btn,
@@ -26,3 +23,34 @@ input.yellow-btn{
color:#300;
}
}
+
+body.mappage .nav-wrapper div.nav-wrapper-2 {
+ background: url('images/city6.png') 30% 0% repeat-x;
+ border-bottom: 2px solid #333;
+}
+#main-nav ul#main-menu li a.report-a-problem-btn:hover {
+ background: #fff;
+}
+
+
+// Replace Sprite with cobrand sprite
+.ie6 #site-logo,
+.ie7 #site-logo,
+.ie6 body.frontpage #site-logo,
+.ie6 #main-nav ul#mysoc-menu li a#mysoc-logo,
+.ie7 #main-nav ul#mysoc-menu li a#mysoc-logo,
+#fms_pan_zoom_panup, #fms_pan_zoom_pandown,
+#fms_pan_zoom_panleft,
+#fms_pan_zoom_panright,
+#fms_pan_zoom_zoomin,
+#fms_pan_zoom_zoomout,
+.button-right,
+a.button-right,
+:hover.button-right,
+a:hover.button-right,
+.button-left,
+a.button-left,
+:hover.button-left,
+a:hover.button-left {
+ background-image: url('images/sprite.png');
+} \ No newline at end of file
diff --git a/web/cobrands/fixmybarangay/images/city6.png b/web/cobrands/fixmybarangay/images/city6.png
new file mode 100644
index 000000000..63d7e674c
--- /dev/null
+++ b/web/cobrands/fixmybarangay/images/city6.png
Binary files differ
diff --git a/web/cobrands/fixmybarangay/images/city7.png b/web/cobrands/fixmybarangay/images/city7.png
new file mode 100644
index 000000000..cea65cb82
--- /dev/null
+++ b/web/cobrands/fixmybarangay/images/city7.png
Binary files differ
diff --git a/web/cobrands/fixmybarangay/images/ie_logo.png b/web/cobrands/fixmybarangay/images/ie_logo.png
index df73a7785..454297104 100644
--- a/web/cobrands/fixmybarangay/images/ie_logo.png
+++ b/web/cobrands/fixmybarangay/images/ie_logo.png
Binary files differ
diff --git a/web/cobrands/fixmybarangay/images/pat3.png b/web/cobrands/fixmybarangay/images/pat3.png
new file mode 100644
index 000000000..a0f755de9
--- /dev/null
+++ b/web/cobrands/fixmybarangay/images/pat3.png
Binary files differ
diff --git a/web/cobrands/fixmybarangay/images/sprite.png b/web/cobrands/fixmybarangay/images/sprite.png
index fad72a23a..cbde4ac7f 100644
--- a/web/cobrands/fixmybarangay/images/sprite.png
+++ b/web/cobrands/fixmybarangay/images/sprite.png
Binary files differ
diff --git a/web/cobrands/fixmybarangay/layout.scss b/web/cobrands/fixmybarangay/layout.scss
index c032c6e60..0f575806a 100644
--- a/web/cobrands/fixmybarangay/layout.scss
+++ b/web/cobrands/fixmybarangay/layout.scss
@@ -1,21 +1,42 @@
@import "_colours";
@import "../fixmystreet/_layout";
+@mixin box_round($radius) {
+ -webkit-border-radius: $radius; /* Safari 3-4, iOS 1-3.2, Android ≤1.6 */
+ border-radius: $radius; /* Opera 10.5, IE9+, Safari 5, Chrome, Firefox 4+, iOS 4, Android 2.1+ */
+
+ /* useful if you don't want a bg color from leaking outside the border: */
+ -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;
+}
+
body {
- background: #1A1A1A;
+ background: #C7B299;
+ background-image: url(images/pat3.png);
+
+ .wrapper{
+ background: url('images/city7.png') 30% 0% repeat-x;
+ }
}
-body.frontpage {
+ body.frontpage {
#site-logo{
width: 370px !important;
- background: url('/cobrands/fixmybarangay/images/sprite.png') -3px -106px no-repeat;
+ height: 70px;
+ background: url('images/sprite.png') -3px -106px no-repeat;
+ }
+
+ .wrapper{
+ background: url('images/city7.png') 30% 0% repeat-x;
}
}
-
+#main-nav ul#mysoc-menu li a#mysoc-logo {
+ background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIkAAAAyCAMAAABf9whNAAAA0lBMVEUAAABAQEBAQEBAQEBNTU1NTU1AQEBNTU1AQEBAQEBAQEBAQEBAQEBAQEBAQEBNTU1NTU1AQEBNTU1AQEBNTU1AQEBAQEBNTU2Mxj9NTU33kx5NTU1NTU1NTU3tHCRmLZEpq+JNTU2TJ4/tHCSTJ4/87iEpq+L3kx5NTU387iH87iHtHCSTJ4/3kx51K5CTJ49mLZGMxj/tHCSx0zVmLZH6wSBmLZFmLZFDdb/zYCFbuZGMxj/3kx5AQEBNTU0pq+LtHCSMxj/3kx787iFmLZGTJ49ns3BGAAAAPXRSTlMAQL+AQIAQECBwMGBQj98gn5/Pr+/vzzC/r79wYI9wv69QcK+vcICfv68QQBAwj0AwMBBggIBQr3BwgEBgSmaQCwAAAflJREFUeF7t1Ndy2zAQhtGfAAX2IpFUseSSOLGd3nt27bT3f6UsQHusRFcKmVxkcGa4wvCG34AQ8V/wPM/zPM8zSaOaxGBHtFpF+IfikqwYO0LmELfiHH/XlLokSBrsiurtPdGkMJJFWFWTSQUZC0RhWMFNRQWuvTw9RS/VOolNEBgAudYpkE5pHqRpEACIZQ4x4RkztxMWd6KWa2DDvFDUBeg9urr6cPAZMIqEDogCmDmJKdwtlbjXOCc1sIRnhyxj0vIMNbeQMUNun5DBOTo6/3oASMhUF6krka3IM1lkikqdGaICMVE2sKSNICkR1sxYyMag5TWQd7bFPH4G8eT8zcOUKIGwJUYuSE7hzoldlZAwM7Dkwg4GQjtmXMtvBZHNiZJ7P+5C3P/2oH9SXyKXo1yJq0sbmmLMkg23h7xCryR1W5L8WqKsmz1BSbqjfNSSiMUGMEB/Bp8ePwdeLF/ZAn1TEssFR1MJIZmyGLUENXNrI8pCK6IMx99fn50tvyyBcuvEKuqKXDcuocgAQ/I7conMGgA5BfD23fvLy4/LT0Ba/v4vphRxR9dnlmIMU4ULO0IgsgPr/rya3H7F4JycoCf3sq0vW5ICiLXO3YtsMC4JqbG3uCFKMSb3nYuwNyLKMK6Q6wj7a7oMY4vwJwwG8TzP8zzP834CEcRJKkEhVogAAAAASUVORK5CYII=");
+}
#front-main {
color: $primary_text;
- background: $primary;
+ background: rgba(255,255,255,0.1);
+ margin-top: 70px;
#postcodeForm {
margin-left: 0;
@@ -41,9 +62,59 @@ body.frontpage {
ul {
&#mysoc-menu {
background:$primary;
+ padding: 1px 0.5em;
}
+ &#main-menu{
+ padding: 3px 0;
+ li{
+ a{
+ //@extend .report-a-problem-btn;
+ color: #fff;
+ padding: 0.7em;
+ background-color: rgba(0,0,0,0);
+ background-image: none;
+ &:hover{
+ background-color: rgba(0,0,0,0.8);
+ }
+ }
+ }
+ }
+
}
}
+body.mappage #main-nav ul#main-menu li a,
+body.mappage #main-nav ul#main-menu li span,
+body #main-nav ul#main-menu li a,
+body #main-nav ul#main-menu li span
+{
+ color: #fff;
+ padding: 0.7em;
+ background-color: rgba(0,0,0,0);
+ background-image: none;
+ @include box_round(0.35em);
+ margin-left: 3px;
+
+ &.report-a-problem-btn{
+ color: #fff;
+ padding: 0.7em;
+ background-color: rgba(0,0,0,0);
+ background-image: none;
+ margin: 0;
+ }
+
+ &:hover{
+ background-color: rgba(0,0,0,0.75);
+ background-image: none;
+ }
+
+}
+
+
+#user-meta {
+ max-width: 96%;
+}
+
+
#front-howto {
#front_stats {
diff --git a/web/cobrands/fixmybarangay/message_manager.scss b/web/cobrands/fixmybarangay/message_manager.scss
index 887a452c0..5b6d7bd62 100644
--- a/web/cobrands/fixmybarangay/message_manager.scss
+++ b/web/cobrands/fixmybarangay/message_manager.scss
@@ -9,117 +9,117 @@ $color_bg_reply_3: #D1D1D1;
$color_bg_reply_4: #C9C9C9;
$color_bg_reply_5: #BFBFBF;
$color_bg_reply_6: #B8B8B8;
-
+$color_bg_mm_list: #F6F6F6;
#message_manager {
- #message-control {
- #mm-username-container {
- display: none; // hidden during dev
- padding: 8px;
- text-align: right;
- color: $mm_status_message_color;
- font-style: italic;
- span {
- color: #000;
- font-style: normal;
- }
- }
- #mm-status-message-container {
- min-height: 1.4em;
- margin: 0 0 8px 0.5em;
- padding: 8px 4px;
- color: $mm_status_message_color;
- font-style: italic;
- }
- #mm-login-container {
- display: none; // only shown on/after a 403
- border: 1px solid $mm_border_color;
- padding: 0 1em;
- margin: 1em;
- input {
- margin-bottom: 1em;
- }
- }
- }
+ #message-control {
+ #mm-username-container {
+ display: none; // hidden during dev
+ padding: 8px;
+ text-align: right;
+ color: $mm_status_message_color;
+ font-style: italic;
+ span {
+ color: #000;
+ font-style: normal;
+ }
+ }
+ #mm-status-message-container {
+ min-height: 1.4em;
+ margin: 0 0 8px 0.5em;
+ padding: 8px 4px;
+ color: $mm_status_message_color;
+ font-style: italic;
+ }
+ #mm-login-container {
+ display: none; // only shown on/after a 403
+ border: 1px solid $mm_border_color;
+ padding: 0 1em;
+ margin: 1em;
+ input {
+ margin-bottom: 1em;
+ }
+ }
+ }
- #mm-message-list {
- ul {
- list-style-type: none;
- padding: 0;
- margin: 0;
- li, ul.mm-reply-thread li {
- position: relative;
- clear: both;
- margin: 4px 0 0 0;
- padding: 0;
- cursor: pointer;
- background-color: #F6F6F6;
- p {
- background-color: inherit;
- margin: 0.25em 0 0 0;
- padding: 0.5em 1em;
- &:hover { background-color: #efe;}
- }
- ul.mm-reply-thread {
- li {
- margin:0;
- }
- .mm-reply {
- background-color: #ccc;
- &:hover {background-color: #eef;}
- }
- .mm-reply-0 { margin-left: 0em; background-color: $color_bg_reply_0;}
- .mm-reply-1 { margin-left: 1em; background-color: $color_bg_reply_1;}
- .mm-reply-2 { margin-left: 2em; background-color: $color_bg_reply_2;}
- .mm-reply-3 { margin-left: 3em; background-color: $color_bg_reply_3;}
- .mm-reply-4 { margin-left: 4em; background-color: $color_bg_reply_4;}
- .mm-reply-5 { margin-left: 5em; background-color: $color_bg_reply_5;}
- .mm-reply-6 { margin-left: 6em; background-color: $color_bg_reply_6;}
- }
- &.msg-is-locked { background-color: #fdd;}
- &.msg-is-owned { background-color: #dfd;}
- &.msg-is-busy { background-color: #ffd;}
- &:hover { background-color: #efe;}
- span.msg-tag {
- width: 3em;
- float:left;
- }
- input[type=radio] {
- display: block;
- float: left;
- }
- label, span.msg-text {
- display: block;
- font-weight: normal;
- margin: 0.1em 0 0.1em 4.5em;
- }
- .mm-msg-action {
- display: none;
- padding: 0.2em 0.4em;
- color: white;
- text-align: center;
- position: absolute;
- top: 4px;
- &:hover { background-color: black;}
- }
- .mm-hide {
- right:0px;
- background-color: red;
- }
- .mm-rep {
- right:1.4em;
- background-color: green;
- }
- }
- }
- }
- p.mm-empty {
- margin: 1em;
- }
+ #mm-message-list {
+ ul {
+ list-style-type: none;
+ padding: 0;
+ margin: 0;
+ li, ul.mm-reply-thread li {
+ position: relative;
+ clear: both;
+ margin: 4px 0 0 0;
+ padding: 0;
+ cursor: pointer;
+ background-color: $color_bg_mm_list;
+ p {
+ background-color: inherit;
+ margin: 0.25em 0 0 0;
+ padding: 0.5em 1em;
+ &:hover { background-color: #efe;}
+ }
+ ul.mm-reply-thread {
+ li {
+ margin:0;
+ }
+ .mm-reply {
+ background-color: #ccc;
+ &:hover {background-color: #eef;}
+ }
+ .mm-reply-0 { margin-left: 0em; background-color: $color_bg_reply_0;}
+ .mm-reply-1 { margin-left: 1em; background-color: $color_bg_reply_1;}
+ .mm-reply-2 { margin-left: 2em; background-color: $color_bg_reply_2;}
+ .mm-reply-3 { margin-left: 3em; background-color: $color_bg_reply_3;}
+ .mm-reply-4 { margin-left: 4em; background-color: $color_bg_reply_4;}
+ .mm-reply-5 { margin-left: 5em; background-color: $color_bg_reply_5;}
+ .mm-reply-6 { margin-left: 6em; background-color: $color_bg_reply_6;}
+ }
+ &.msg-is-locked { background-color: #fdd;}
+ &.msg-is-owned { background-color: #dfd;}
+ &.msg-is-busy { background-color: #ffd;}
+ &:hover { background-color: #efe;}
+ span.msg-tag {
+ width: 3em;
+ float:left;
+ }
+ input[type=radio] {
+ display: block;
+ float: left;
+ }
+ label, span.msg-text {
+ display: block;
+ font-weight: normal;
+ margin: 0.1em 0 0.1em 4.5em;
+ }
+ .mm-msg-action {
+ display: none;
+ padding: 0.2em 0.4em;
+ color: white;
+ text-align: center;
+ position: absolute;
+ top: 4px;
+ &:hover { background-color: black;}
+ }
+ .mm-hide {
+ right:0px;
+ background-color: red;
+ }
+ .mm-rep {
+ right:1.4em;
+ background-color: green;
+ }
+ }
+ }
+ }
+ p.mm-empty {
+ margin: 1em;
+ }
}
-#add_support { /* COPY TO UPDATE button */
- margin: 1em;
+#show_messages, #add_support { // COPY TO UPDATE button
+ margin: 1em;
}
#reply-form-container {
#reply-form{
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 02:05:06 +0000