Merge pull request #15 from stacyk/development

Thanks Stacy.
This commit is contained in:
JayWood
2014-12-01 11:10:47 -05:00
6 changed files with 32 additions and 12 deletions

View File

@ -67,6 +67,7 @@ Please do not contact me with questions like this. If you cannot be descriptive
* New filters & actions for developers * New filters & actions for developers
* Switched CSS priority, to allow custom css to override bg image and opacity * Switched CSS priority, to allow custom css to override bg image and opacity
* Converted sass file to nested sass and uses classes instead of IDs * Converted sass file to nested sass and uses classes instead of IDs
* [stacyk](https://github.com/stacyk) - Made buttons visible on popup at all times.
### 3.5.5 ### 3.5.5
* [jgraup](https://github.com/jgraup) - Fixed Menu Positioning * [jgraup](https://github.com/jgraup) - Fixed Menu Positioning

View File

@ -9,16 +9,16 @@
/* Main CWV3 Dialog */ /* Main CWV3 Dialog */
.cwv3_dialog { .cwv3_dialog {
border: 3px solid #cccccc; border: 3px solid #CCCCCC;
background: white; background: #FFFFFF;
max-width: 60%; max-width: 60%;
max-height: 90%; max-height: 90%;
position: fixed; position: fixed;
top: 25%; top: 25%;
left: 25%; left: 25%;
-webkit-box-shadow: 2px 11px 48px black; -webkit-box-shadow: 2px 11px 48px #000;
-moz-box-shadow: 2px 11px 48px black; -moz-box-shadow: 2px 11px 48px #000;
box-shadow: 2px 11px 48px black; box-shadow: 2px 11px 48px #000;
overflow: hidden; overflow: hidden;
z-index: 99999; z-index: 99999;
} }
@ -29,37 +29,46 @@
height: 100%; height: 100%;
} }
.cwv3_dialog .cwv3_title { .cwv3_dialog .cwv3_title {
color: white; color: #FFFFFF;
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
background: red; background: #FF0000;
} }
.cwv3_dialog .cwv3_content { .cwv3_dialog .cwv3_content {
height: 84%; height: 84%;
overflow-y: scroll; overflow-y: scroll;
padding: .75em;
} }
.cwv3_dialog .cwv3_btns { .cwv3_dialog .cwv3_btns {
background: rgba(50, 50, 50, 0.7);
bottom: 0;
overflow: hidden; overflow: hidden;
padding: .45em .75em;
position: absolute;
width: 100%;
} }
.cwv3_dialog .cwv3_btns a { .cwv3_dialog .cwv3_btns a {
display: block; display: block;
width: 100%; width: 100%;
text-align: center; text-align: center;
color: white; color: #FFFFFF;
font-weight: bold; font-weight: bold;
text-decoration: none; text-decoration: none;
padding: .35em;
} }
.cwv3_dialog .cwv3_btns .cwv3_exit { .cwv3_dialog .cwv3_btns .cwv3_exit {
float: right; float: right;
width: 40%; width: 40%;
} }
.cwv3_dialog .cwv3_btns .cwv3_exit a { .cwv3_dialog .cwv3_btns .cwv3_exit a {
background-color: red; background-color: #FF0000;
} }
.cwv3_dialog .cwv3_btns .cwv3_enter { .cwv3_dialog .cwv3_btns .cwv3_enter {
float: left; float: left;
width: 40%; width: 40%;
} }
.cwv3_dialog .cwv3_btns .cwv3_enter a { .cwv3_dialog .cwv3_btns .cwv3_enter a {
background-color: #00cc33; background-color: #00CC33;
} }
/*# sourceMappingURL=cwv3.css.map */

2
css/cwv3.min.css vendored
View File

@ -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:84%;overflow-y:scroll}.cwv3_dialog .cwv3_btns{overflow:hidden}.cwv3_dialog .cwv3_btns a{display:block;width:100%;text-align:center;color:#fff;font-weight:700;text-decoration:none}.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} .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:84%;overflow-y:scroll;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}

View File

@ -40,10 +40,17 @@
.cwv3_content{ .cwv3_content{
height: 84%; height: 84%;
overflow-y: scroll; overflow-y: scroll;
padding: .75em;
} }
.cwv3_btns{ .cwv3_btns{
background: $button-background;
bottom: 0;
overflow: hidden; overflow: hidden;
padding: .45em .75em;
position: absolute;
width: 100%;
a{ a{
display: block; display: block;
width: 100%; width: 100%;
@ -51,6 +58,7 @@
color: $button-txt-color; color: $button-txt-color;
font-weight: bold; font-weight: bold;
text-decoration: none; text-decoration: none;
padding: .35em;
} }
.cwv3_exit{ .cwv3_exit{

View File

@ -3,6 +3,7 @@
/// ///
$button-txt-color : #FFFFFF; $button-txt-color : #FFFFFF;
$button-background : rgba(50,50,50,.7);
$exit-button-color : #FF0000; $exit-button-color : #FF0000;
$enter-button-color : #00CC33; $enter-button-color : #00CC33;

View File

@ -87,6 +87,7 @@ Please do not contact me with questions like this. If you cannot be descriptive
* Split methods and hooks from main class file, will prevent overhead. * Split methods and hooks from main class file, will prevent overhead.
* Moved to use of cookie.js * Moved to use of cookie.js
* Created API file for methods. * Created API file for methods.
* [stacyk](https://github.com/stacyk) - Made buttons visible on popup at all times.
= 3.5.5 = = 3.5.5 =
* [jgraup](https://github.com/jgraup) - Fixed Menu Positioning * [jgraup](https://github.com/jgraup) - Fixed Menu Positioning