From d59e6655a6e3821a0e85794400ddf843948cd505 Mon Sep 17 00:00:00 2001 From: Jay Wood Date: Sun, 14 Dec 2014 00:42:57 -0500 Subject: [PATCH] Final css fixes before testing --- css/cwv3.css | 37 ++++++++++++++++--------------- css/cwv3.min.css | 2 +- css/sass/partials/_cwv3.scss | 16 ++++++++----- css/sass/partials/_variables.scss | 2 +- 4 files changed, 32 insertions(+), 25 deletions(-) diff --git a/css/cwv3.css b/css/cwv3.css index 9afa670..ca027a0 100644 --- a/css/cwv3.css +++ b/css/cwv3.css @@ -9,16 +9,16 @@ /* Main CWV3 Dialog */ .cwv3_dialog { - border: 3px solid #CCCCCC; - background: #FFFFFF; + border: 3px solid #cccccc; + background: white; max-width: 60%; max-height: 90%; position: fixed; top: 25%; left: 25%; - -webkit-box-shadow: 2px 11px 48px #000; - -moz-box-shadow: 2px 11px 48px #000; - box-shadow: 2px 11px 48px #000; + -webkit-box-shadow: 2px 11px 48px black; + -moz-box-shadow: 2px 11px 48px black; + box-shadow: 2px 11px 48px black; overflow: hidden; z-index: 99999; } @@ -29,46 +29,47 @@ height: 100%; } .cwv3_dialog .cwv3_title { - color: #FFFFFF; + color: white; font-weight: bold; text-align: center; - background: #FF0000; + background: red; + margin-bottom: 0.25em; } .cwv3_dialog .cwv3_content { height: 80%; max-height: 700px; padding: .75em; + overflow: auto; + margin-bottom: 0.25em; } .cwv3_dialog .cwv3_btns { - background: rgba(50, 50, 50, 0.7); + background: rgba(50, 50, 50, 0.5); bottom: 0; overflow: hidden; padding: .45em .75em; - position: absolute; - width: 100%; } .cwv3_dialog .cwv3_btns a { display: block; width: 100%; text-align: center; - color: #FFFFFF; + color: white; font-weight: bold; text-decoration: none; - padding: .35em; + padding: .35em 0; +} +.cwv3_dialog .cwv3_btns div { + width: 30%; + display: inline-block; } .cwv3_dialog .cwv3_btns .cwv3_exit { float: right; - width: 40%; } .cwv3_dialog .cwv3_btns .cwv3_exit a { - background-color: #FF0000; + background-color: red; } .cwv3_dialog .cwv3_btns .cwv3_enter { float: left; - width: 40%; } .cwv3_dialog .cwv3_btns .cwv3_enter a { - background-color: #00CC33; + background-color: #00cc33; } - -/*# sourceMappingURL=cwv3.css.map */ diff --git a/css/cwv3.min.css b/css/cwv3.min.css index 7ab7984..f1b0f15 100644 --- a/css/cwv3.min.css +++ b/css/cwv3.min.css @@ -1 +1 @@ -.cwv3.dialog-overlay{position:fixed;top:0;left:0;width:100%;height:100%;z-index:99998}.cwv3_dialog{border:3px solid #CCC;background:#FFF;max-width:60%;max-height:90%;position:fixed;top:25%;left:25%;-webkit-box-shadow:2px 11px 48px #000;-moz-box-shadow:2px 11px 48px #000;box-shadow:2px 11px 48px #000;overflow:hidden;z-index:99999}.cwv3_dialog div{padding:.25em}.cwv3_dialog .cwv3.auth,.cwv3_dialog .cwv3.denied{height:100%}.cwv3_dialog .cwv3_title{color:#FFF;font-weight:700;text-align:center;background:red}.cwv3_dialog .cwv3_content{height:80%;max-height:700px;padding:.75em}.cwv3_dialog .cwv3_btns{background:rgba(50,50,50,.7);bottom:0;overflow:hidden;padding:.45em .75em;position:absolute;width:100%}.cwv3_dialog .cwv3_btns a{display:block;width:100%;text-align:center;color:#FFF;font-weight:700;text-decoration:none;padding:.35em}.cwv3_dialog .cwv3_btns .cwv3_exit{float:right;width:40%}.cwv3_dialog .cwv3_btns .cwv3_exit a{background-color:red}.cwv3_dialog .cwv3_btns .cwv3_enter{float:left;width:40%}.cwv3_dialog .cwv3_btns .cwv3_enter a{background-color:#0C3} \ No newline at end of file +.cwv3.dialog-overlay{position:fixed;top:0;left:0;width:100%;height:100%;z-index:99998}.cwv3_dialog{border:3px solid #ccc;background:#fff;max-width:60%;max-height:90%;position:fixed;top:25%;left:25%;-webkit-box-shadow:2px 11px 48px #000;-moz-box-shadow:2px 11px 48px #000;box-shadow:2px 11px 48px #000;overflow:hidden;z-index:99999}.cwv3_dialog div{padding:.25em}.cwv3_dialog .cwv3.auth,.cwv3_dialog .cwv3.denied{height:100%}.cwv3_dialog .cwv3_title{color:#fff;font-weight:700;text-align:center;background:red;margin-bottom:.25em}.cwv3_dialog .cwv3_content{height:80%;max-height:700px;padding:.75em;overflow:auto;margin-bottom:.25em}.cwv3_dialog .cwv3_btns{background:rgba(50,50,50,.5);bottom:0;overflow:hidden;padding:.45em .75em}.cwv3_dialog .cwv3_btns a{display:block;width:100%;text-align:center;color:#fff;font-weight:700;text-decoration:none;padding:.35em 0}.cwv3_dialog .cwv3_btns div{width:30%;display:inline-block}.cwv3_dialog .cwv3_btns .cwv3_exit{float:right}.cwv3_dialog .cwv3_btns .cwv3_exit a{background-color:red}.cwv3_dialog .cwv3_btns .cwv3_enter{float:left}.cwv3_dialog .cwv3_btns .cwv3_enter a{background-color:#0c3} \ No newline at end of file diff --git a/css/sass/partials/_cwv3.scss b/css/sass/partials/_cwv3.scss index 1afd769..8957771 100644 --- a/css/sass/partials/_cwv3.scss +++ b/css/sass/partials/_cwv3.scss @@ -35,12 +35,15 @@ font-weight: bold; text-align: center; background: $title-background; + margin-bottom: 0.25em; } .cwv3_content{ height: 80%; max-height: 700px; padding: .75em; + overflow: auto; + margin-bottom: 0.25em; } .cwv3_btns{ @@ -48,8 +51,8 @@ bottom: 0; overflow: hidden; padding: .45em .75em; - position: absolute; - width: 100%; + // position: absolute; + // width: 100%; a{ display: block; @@ -58,12 +61,16 @@ color: $button-txt-color; font-weight: bold; text-decoration: none; - padding: .35em; + padding: .35em 0; + } + + div{ + width: 30%; + display: inline-block; } .cwv3_exit{ float: right; - width: 40%; a{ background-color: $exit-button-color; } @@ -71,7 +78,6 @@ .cwv3_enter{ float: left; - width: 40%; a{ background-color: $enter-button-color; } diff --git a/css/sass/partials/_variables.scss b/css/sass/partials/_variables.scss index f45c9af..9e1e31d 100644 --- a/css/sass/partials/_variables.scss +++ b/css/sass/partials/_variables.scss @@ -3,7 +3,7 @@ /// $button-txt-color : #FFFFFF; -$button-background : rgba(50,50,50,.7); +$button-background : rgba( 50, 50, 50,.5 ); $exit-button-color : #FF0000; $enter-button-color : #00CC33;