Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Overlap Changes #93

Merged
merged 9 commits into from
Mar 28, 2018
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions css/aeTable.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Table layout
\--------------------------------------------------------------------------------------***/

div.aeTable div.navbar {
div.aeTable div.wc-navbar {
margin-top:5px;
}

Expand All @@ -19,15 +19,15 @@
font-size:14px;
}

div.aeTable div.navbar .dropdown-menu li {
div.aeTable div.wc-navbar .wc-dropdown-menu li {
cursor: pointer;
}

div.aeTable div.navbar ul.dropdown-menu li a.disabled {
div.aeTable div.wc-navbar ul.wc-dropdown-menu li a.disabled {
color: #BBB;
}

div.aeTable .alert{
div.aeTable .wc-alert{
padding: 20px;
background-color: #f44336; /* Red */
color: white;
Expand Down Expand Up @@ -141,7 +141,7 @@
margin: 0 3px 5px 0;
}

div.aeTable .controls .custom-filters ul li.active > a > label,
div.aeTable .controls .custom-filters ul li.wc-active > a > label,
div.aeTable .controls .custom-filters ul li:hover > a > label {
color: white;
}
Expand Down Expand Up @@ -181,7 +181,7 @@
cursor:pointer;
}

div.aeTable .navbar-search .search-query {
div.aeTable .wc-navbar-search .search-query {
line-height: 1.3em;
}

Expand Down Expand Up @@ -273,9 +273,9 @@
display:none;
}

div.aeTable .hidden,
div.aeTable .controls .hidden,
div.aeTable .controls .filterDiv.custom-filters.hidden {
div.aeTable .wc-hidden,
div.aeTable .controls .wc-hidden,
div.aeTable .controls .filterDiv.custom-filters.wc-hidden {
display: none;
}

Expand Down