Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
topdown committed May 24, 2016
2 parents 2d1146e + 7f24953 commit 3b8a394
Show file tree
Hide file tree
Showing 78 changed files with 8,227 additions and 2,661 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ cache/*
custom.css
dumps/*
notes.txt
favorites/themes.txt
favorites/plugins.txt
28 changes: 28 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,14 @@ cp dashboard-custom.php ..
* List hosts in VVV
* Debug On/Off for WP sites
* Show not installed if wp-config.php is missing
* Multisite detection and lists sub-sites under the parent host
* WP Version for each host
* Visit Site Link
* Visit Admin Link
* Profiler Link
* Backup Database (SQL Dump) host-timestamped name
* Debug Log viewer if debug log is found
* Drag and drop sorting, stored in a 30 day cookie
* Live/Fuzzy search host list
* List Plugins for each installed WordPress Site
* Plugin Name
Expand All @@ -60,6 +62,7 @@ cp dashboard-custom.php ..
* Host
* Date of backup
* Time of backup
* Live search
* Actions
* Save As (In case you want to save another copy somewhere else)
* Roll Back (Roll back to any existing version for the host)
Expand Down Expand Up @@ -139,6 +142,31 @@ create a `VVV/www/default/dashboard/custom.css` file and add this
### Change Log

---

mm/dd/yy


05/24/16 version: 0.1.7

* Fixed host debug log empty #30
* Multisite detection and lists sub-sites under the parent host #32


05/24/16 version: 0.1.6

* Drag and drop sorting of the host list/table stored in a 30 day cookie #28


05/09/16 version: 0.1.5

* Lots of changes, refactoring both actions and hosts #17 #26 and #25
* New hosts objects allows separating different types of hosts and hopefully fixes all past issues related to hosts #25
* New commands/action objects handles all of the theme, plugins, backups, etc... #17 #26
* Added branch specific version check so if you are running a branch other than mater you will get a notice for updates in that branch.
* Folders in the {VVV}/www/ directory that start with a _ underscore are tracked and marked as archives in the dashboard so you can archive sites in a directory like _archives
* Live search in backups


12/12/15 version: 0.1.4

* Added WPStarter support by fixing some path issues
Expand Down
2 changes: 1 addition & 1 deletion compass/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# relative_assets = true

# To disable debugging comments that display the original location of your selectors. Uncomment:
line_comments = true
line_comments = false


# If you prefer the indented syntax, you might want to regenerate this
Expand Down
4 changes: 2 additions & 2 deletions compass/sass/_bootstrap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// Components
@import "../../bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/component-animations";
@import "../../bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/glyphicons";
//@import "../../bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/dropdowns";
@import "../../bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/dropdowns";
@import "../../bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/button-groups";
@import "../../bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/input-groups";
@import "../../bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/navs";
Expand All @@ -41,7 +41,7 @@

// Components w/ JavaScript
//@import "../../bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/modals";
//@import "../../bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/tooltip";
@import "../../bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/tooltip";
//@import "../../bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/popovers";
//@import "../../bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/carousel";

Expand Down
58 changes: 52 additions & 6 deletions compass/sass/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -259,20 +259,45 @@ input.child-name {
.navbar p.pull-right {
margin: 0;
position: absolute;
top: 5px;
right: 20px;
top: 5px;
right: 20px;
}

.navbar .github-link {
.navbar .gitter {
margin-left: 8px;
position: relative;
top: 5px;
position: relative;
top: 5px;
}

.navbar .github-link {
margin-left: 10px;
position: relative;
top: 5px;
}

.navbar .github-link:hover .fa-inverse {
color: #00b3ee;
}

.navbar .gitter:hover .fa-inverse {
color: #d9534f;
}

.sites {
button span {
//display: none;
}
}

.create-plugin .taxonomy {
padding: 5px 0 0 50px;
}

.close {
display: inline-block;
margin-bottom: 8px;
}

/********************************************************************
= custom classes *********
*********************************************************************/
Expand All @@ -290,4 +315,25 @@ input.child-name {

.red {
color: darkred;
}
}

.ui-sortable tr {
cursor: pointer;
}

.ui-sortable tr:hover {
//background: rgba(244, 251, 17, 0.45);
}

td span.handle {
padding: 0 5px 0 0;
color: #aaa;
i {
vertical-align: -1px;
}
}

tr:hover td span.handle {
color: #777;
}

111 changes: 111 additions & 0 deletions compass/sass/custom-example.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@

.sites {
display: table;
max-height: 100%;
overflow-y: auto;
overflow-x: auto;
}

.btn-primary {
//background: #428bca
background-color: #1171A3
}

.btn-success {
//background: #5cb85c;
background-color: #43C83C;
}

.btn-warning {
//background: #f0ad4e;
background-color: #F88529;
}

.btn-danger {
//background: #d9534f;
background-color: #FA3031;
}

.btn-info {
background-color: #5bc0de;
}

.btn-default {
color: #fff;
background-color: #333;
}

.alert-success {
background-color: #dff0d8;
border-color: #d6e9c6;
color: #3c763d;
}

.alert-success hr {
border-top-color: #c9e2b3;
}

.alert-success .alert-link {
color: #2b542c;
}

.alert-info {
background-color: #d9edf7;
border-color: #bce8f1;
color: #31708f;
}

.alert-info hr {
border-top-color: #a6e1ec;
}

.alert-info .alert-link {
color: #245269;
}

.alert-warning {
background-color: #fcf8e3;
border-color: #faebcc;
color: #8a6d3b;
}

.alert-warning hr {
border-top-color: #f7e1b5;
}

.alert-warning .alert-link {
color: #66512c;
}

.alert-danger {
background-color: #f2dede;
border-color: #ebccd1;
color: #a94442;
}

.alert-danger hr {
border-top-color: #e4b9c0;
}

.alert-danger .alert-link {
color: #843534;
}

.close {
float: right;
font-size: 21px;
font-weight: bold;
line-height: 1;
color: #000;
text-shadow: 0 1px 0 #fff;
opacity: 0.2;
filter: alpha(opacity=20);
}

.close:hover, .close:focus {
color: #000;
text-decoration: none;
cursor: pointer;
opacity: 0.5;
filter: alpha(opacity=50);
}
106 changes: 106 additions & 0 deletions custom-example.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
.sites {
display: table;
max-height: 100%;
overflow-y: auto;
overflow-x: auto;
}

.btn-primary {
background-color: #1171A3;
}

.btn-success {
background-color: #43C83C;
}

.btn-warning {
background-color: #F88529;
}

.btn-danger {
background-color: #FA3031;
}

.btn-info {
background-color: #5bc0de;
}

.btn-default {
color: #fff;
background-color: #333;
}

.alert-success {
background-color: #dff0d8;
border-color: #d6e9c6;
color: #3c763d;
}

.alert-success hr {
border-top-color: #c9e2b3;
}

.alert-success .alert-link {
color: #2b542c;
}

.alert-info {
background-color: #d9edf7;
border-color: #bce8f1;
color: #31708f;
}

.alert-info hr {
border-top-color: #a6e1ec;
}

.alert-info .alert-link {
color: #245269;
}

.alert-warning {
background-color: #fcf8e3;
border-color: #faebcc;
color: #8a6d3b;
}

.alert-warning hr {
border-top-color: #f7e1b5;
}

.alert-warning .alert-link {
color: #66512c;
}

.alert-danger {
background-color: #f2dede;
border-color: #ebccd1;
color: #a94442;
}

.alert-danger hr {
border-top-color: #e4b9c0;
}

.alert-danger .alert-link {
color: #843534;
}

.close {
float: right;
font-size: 21px;
font-weight: bold;
line-height: 1;
color: #000;
text-shadow: 0 1px 0 #fff;
opacity: 0.2;
filter: alpha(opacity=20);
}

.close:hover, .close:focus {
color: #000;
text-decoration: none;
cursor: pointer;
opacity: 0.5;
filter: alpha(opacity=50);
}
Loading

0 comments on commit 3b8a394

Please sign in to comment.