Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/dicarve/slims8_akasia
Browse files Browse the repository at this point in the history
  • Loading branch information
@dicarve
dicarve committed Jun 5, 2015
2 parents dd7954b + 3502943 commit 8abd4ff
Show file tree
Hide file tree
Showing 140 changed files with 4,091 additions and 2,171 deletions.
213 changes: 161 additions & 52 deletions admin/admin_template/default/assets/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ a:hover {
.s-menu li label {
white-space: nowrap;
width: 100%;
text-align: left;
}
.s-menu-title {
display: inline-block;
Expand Down Expand Up @@ -329,6 +330,7 @@ a:hover {
height: 25px;
border-radius: 50px;
text-align: center;
position: relative;
}
.s-user-photo img {
width: 25px;
Expand All @@ -345,12 +347,13 @@ a:hover {
@media (min-width: 768px) {
.s-user-photo {
border: solid 4px #31353E;
;
width: 63px;
height: 63px;
}
.s-user-photo img {
width: 55px;
width: auto;
height: 80px;
background-size: cover;
}
.s-user-name {
display: block;
Expand Down Expand Up @@ -704,23 +707,11 @@ fieldset[disabled] .btn-success.active {
background-color: #A9E2D0;
border-color: #A9E2D0;
}
.uncheck-all,
.check-all,
.btn-warning {
color: #fff;
background-color: #F4CC17;
border-color: #F4CC17;
}
.uncheck-all:hover,
.uncheck-all:focus,
.uncheck-all.focus,
.uncheck-all:active,
.uncheck-all.active,
.check-all:hover,
.check-all:focus,
.check-all.focus,
.check-all:active,
.check-all.active,
.btn-warning:hover,
.btn-warning:focus,
.btn-warning.focus,
Expand All @@ -731,48 +722,12 @@ fieldset[disabled] .btn-success.active {
background-color: #F4CD16;
border-color: #F4CD16;
}
.check-all:active,
.check-all.active,
.btn-warning:active,
.btn-warning.active,
.open > .dropdown-toggle.btn-warning {
background-image: none;
}

.check-all.disabled,
.check-all[disabled],
fieldset[disabled] .check-all,
.check-all.disabled:hover,
.check-all[disabled]:hover,
fieldset[disabled] .check-all:hover,
.check-all.disabled:focus,
.check-all[disabled]:focus,
fieldset[disabled] .check-all:focus,
.check-all.disabled.focus,
.check-all[disabled].focus,
fieldset[disabled] .check-all.focus,
.check-all.disabled:active,
.check-all[disabled]:active,
fieldset[disabled] .check-all:active,
.check-all.disabled.active,
.check-all[disabled].active,
.uncheck-all.disabled,
.uncheck-all[disabled],
fieldset[disabled] .uncheck-all,
.uncheck-all.disabled:hover,
.uncheck-all[disabled]:hover,
fieldset[disabled] .uncheck-all:hover,
.uncheck-all.disabled:focus,
.uncheck-all[disabled]:focus,
fieldset[disabled] .uncheck-all:focus,
.uncheck-all.disabled.focus,
.uncheck-all[disabled].focus,
fieldset[disabled] .uncheck-all.focus,
.uncheck-all.disabled:active,
.uncheck-all[disabled]:active,
fieldset[disabled] .uncheck-all:active,
.uncheck-all.disabled.active,
.uncheck-all[disabled].active,
.btn-warning.disabled,
.btn-warning[disabled],
fieldset[disabled] .btn-warning,
Expand All @@ -794,12 +749,19 @@ fieldset[disabled] .btn-warning.active {
background-color: #FBF0BF;
border-color: #FBF0BF;
}
.cancelButton,
.btn-delete,
.btn-danger {
color: #fff;
background-color: #4AC49B;
border-color: #4AC49B;
}

.cancelButton:hover,
.cancelButton:focus,
.cancelButton.focus,
.cancelButton:active,
.cancelButton.active,
.btn-delete:hover,
.btn-delete:focus,
.btn-delete.focus,
Expand Down Expand Up @@ -1103,6 +1065,47 @@ tr.dataListHeader > td > a {
text-transform: uppercase;
white-space: nowrap;
}

/* serial control module */
.addSubscription {
margin-left: auto;
margin-right: auto;
display: block;
width: 32px;
height: 32px;
float: right;
}
.addSubscription:before {
font-family: 'FontAwesome';
content: '\f0fe';
font-size: 15px;
color: #31353E;
}
.addSubscription:hover {
text-decoration: none;
color: #fff !important;
}


.viewSubscription {
margin-left: auto;
margin-right: auto;
display: block;
width: 32px;
height: 32px;
float: right;
}
.viewSubscription:before {
font-family: 'FontAwesome';
content: '\f002';
font-size: 15px;
color: #31353E;
}
.viewSubscription:hover {
text-decoration: none;
color: #fff !important;
}

.editLink {
margin-left: auto;
margin-right: auto;
Expand Down Expand Up @@ -1188,6 +1191,7 @@ tr.dataListHeader > td > a {
padding: 15px 10px;
margin: 15px 11px 15px 10px;
color: #fff;
position: relative;
}
.menuBoxInner .sub_section {
background-color: #fff;
Expand Down Expand Up @@ -1512,7 +1516,7 @@ tr.dataListHeader > td > a {
background-color: transparent;
position: absolute;
right: 21px;
top: 79px;
top: 15px;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
border-radius: 50px;
overflow: hidden;
Expand All @@ -1523,6 +1527,24 @@ tr.dataListHeader > td > a {
text-align: center;
padding: 0 !important;
}


#memberImage {
background-color: transparent;
position: absolute;
right: 21px;
top: 15px;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
border-radius: 50px;
overflow: hidden;
font-size: 12px;
display: inline-block;
width: 75px !important;
height: 75px !important;
text-align: center;
padding: 0 !important;
}

.s-person-photo img {
width: 100px;
border: none !important;
Expand All @@ -1531,13 +1553,14 @@ tr.dataListHeader > td > a {
margin-left: auto;
padding: 0;
}
#memberImage img,
#userImage img {
border: none !important;
text-align: center;
margin-right: auto;
margin-left: auto;
padding: 0;
width: 75px;
height: 80px;
}
#listsFrame {
min-height: 370px !important;
Expand Down Expand Up @@ -2182,4 +2205,90 @@ table {
}
.envinfo .form-group {
border-bottom: 1px solid #eee;
}

/* Chat
================================ */
.s-chat {
z-index:3099;
display: block;
position: fixed;
bottom: 51px;
right: 12px;
text-align: center;
width:275px;
background: #fff;
padding: 0;
border-left: solid 1px #f2f2f2;
border-right: solid 1px #f2f2f2;
box-shadow: 0 0 20px rgba(0,0,0,0.1);
}

.s-chat-header {
border-bottom: solid 1px #333;
display: block;
background-color: #282828;
border-left: solid 1px #282828;
border-right: solid 1px #282828;
width:275px;
left:-1px;
padding: 20px 0;
position: relative;
font-size: 8px;
text-transform: uppercase;
letter-spacing: 4px;
color: #fff;
}

.s-chat-header:hover {
background-color: #333;
color: #fff;
}

.s-chat-header:focus,
.s-chat-header:active,
.s-chat-header:visited {
color: #fff;
}

.s-chat-content {
padding: 20px;
}

.s-chat-content label {
padding:10px 0;
font-size: 8px;
text-transform: uppercase;
letter-spacing: 4px;
}

.s-chat-content textarea,
.s-chat-content input {
width: 100%;
border: solid 1px #ddd;
padding:10px;
font-size: 12px;
}

.s-chat-content textarea {
min-height: 200px;
line-height: 24px;
}

.s-chat footer {
border-top: solid 1px #ddd;
font-size: 10px;
padding: 8pt !important;
}

.s-minimize {
bottom: -357px;
-webkit-transition: all 150ms ease;
transition: all 150ms ease;
}

.s-maximize {
bottom: 0px;
-webkit-transition: all 150ms ease;
transition: all 150ms ease;
}
5 changes: 2 additions & 3 deletions admin/admin_template/default/function.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
*/

/*

// be sure that this file not accessed directly
if (!defined('INDEX_AUTH')) {
die("can not access this file directly");
Expand All @@ -29,7 +29,6 @@
}

include_once '../sysconfig.inc.php';
*/

// Generate Menu
function main_menu()
Expand All @@ -38,7 +37,7 @@ function main_menu()
$modules_dir = 'modules';
$module_table = 'mst_module';
$module_list = array();
$_menu = '';
$_menu = '';
$icon = array(
'home' => 'fa fa-home',
'bibliography' => 'fa fa-bookmark',
Expand Down
Loading

0 comments on commit 8abd4ff

Please sign in to comment.