mirror of
https://github.com/humhub/humhub.git
synced 2025-01-17 22:28:51 +01:00
Further design changes
This commit is contained in:
Andy Strobel
parent
45169f4861
commit
4bba8c91e9
6
css/animate.min.css
vendored
Normal file
6
css/animate.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
190
css/style.css
190
css/style.css
@ -184,8 +184,8 @@ textarea {
|
||||
}
|
||||
#topbar-first .notifications #dropdown-notifications li i.approval {
|
||||
position: absolute;
|
||||
left: 4px;
|
||||
top: 34px;
|
||||
left: 2px;
|
||||
top: 36px;
|
||||
font-size: 14px;
|
||||
}
|
||||
#topbar-first .notifications #dropdown-notifications li i.accepted {
|
||||
@ -257,16 +257,6 @@ textarea {
|
||||
.media .media-body .content {
|
||||
margin-right: 35px;
|
||||
}
|
||||
.panel .statistics {
|
||||
margin-top: 40px;
|
||||
margin-right: 20px;
|
||||
}
|
||||
.panel .statistics .entry {
|
||||
margin-left: 20px;
|
||||
}
|
||||
.panel .statistics .entry .count {
|
||||
font-size: 30px;
|
||||
}
|
||||
.panel.profile {
|
||||
position: relative;
|
||||
}
|
||||
@ -281,9 +271,95 @@ textarea {
|
||||
.panel.spaces .panel-body a img {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
.panel-profile .panel-profile-header {
|
||||
position: relative;
|
||||
border: 3px solid #fff;
|
||||
border-top-right-radius: 3px;
|
||||
border-top-left-radius: 3px;
|
||||
}
|
||||
.panel-profile .panel-profile-header .img-profile-header-background {
|
||||
border-radius: 3px;
|
||||
}
|
||||
.panel-profile .panel-profile-header .img-profile-data {
|
||||
position: absolute;
|
||||
height: 100px;
|
||||
width: 100%;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
padding-left: 180px;
|
||||
padding-top: 30px;
|
||||
border-bottom-right-radius: 3px;
|
||||
border-bottom-left-radius: 3px;
|
||||
color: #fff;
|
||||
background: -moz-linear-gradient(top, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0) 1%, rgba(0, 0, 0, 0.58) 100%);
|
||||
/* FF3.6+ */
|
||||
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgba(0, 0, 0, 0)), color-stop(1%, rgba(0, 0, 0, 0)), color-stop(100%, rgba(0, 0, 0, 0.58)));
|
||||
/* Chrome,Safari4+ */
|
||||
background: -webkit-linear-gradient(top, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0) 1%, rgba(0, 0, 0, 0.58) 100%);
|
||||
/* Chrome10+,Safari5.1+ */
|
||||
background: -o-linear-gradient(top, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0) 1%, rgba(0, 0, 0, 0.58) 100%);
|
||||
/* Opera 11.10+ */
|
||||
background: -ms-linear-gradient(top, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0) 1%, rgba(0, 0, 0, 0.58) 100%);
|
||||
/* IE10+ */
|
||||
background: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0) 1%, rgba(0, 0, 0, 0.58) 100%);
|
||||
/* W3C */
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#94000000', GradientType=0);
|
||||
/* IE6-9 */
|
||||
}
|
||||
.panel-profile .panel-profile-header .img-profile-data h1 {
|
||||
font-size: 30px;
|
||||
font-weight: 100;
|
||||
margin-bottom: 7px;
|
||||
}
|
||||
.panel-profile .panel-profile-header .img-profile-data h2 {
|
||||
font-size: 16px;
|
||||
font-weight: 400;
|
||||
margin-top: 0;
|
||||
}
|
||||
.panel-profile .panel-profile-header .profile-user-photo-container {
|
||||
position: absolute;
|
||||
bottom: -50px;
|
||||
left: 15px;
|
||||
}
|
||||
.panel-profile .panel-profile-header .profile-user-photo-container .profile-user-photo {
|
||||
border: 3px solid #fff;
|
||||
border-radius: 5px;
|
||||
}
|
||||
.panel-profile .panel-profile-controls {
|
||||
padding-left: 160px;
|
||||
}
|
||||
.pagination-container {
|
||||
text-align: center;
|
||||
}
|
||||
@media screen and (max-width: 768px) {
|
||||
.modal-dialog {
|
||||
width: auto !important;
|
||||
padding-top: 30px;
|
||||
padding-bottom: 30px;
|
||||
}
|
||||
}
|
||||
.modal-dialog-extra-small {
|
||||
width: 400px;
|
||||
}
|
||||
.modal-dialog-small {
|
||||
width: 500px;
|
||||
}
|
||||
.modal-dialog-normal {
|
||||
width: 600px;
|
||||
}
|
||||
.modal-dialog-medium {
|
||||
width: 768px;
|
||||
}
|
||||
.modal-dialog-large {
|
||||
width: 900px;
|
||||
}
|
||||
@media screen and (max-width: 920px) {
|
||||
.modal-dialog-large {
|
||||
width: auto !important;
|
||||
padding-top: 30px;
|
||||
padding-bottom: 30px;
|
||||
}
|
||||
}
|
||||
.grid-view img {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
@ -332,7 +408,7 @@ ul.tag_input li img {
|
||||
font-size: 12px !important;
|
||||
padding: 2px;
|
||||
float: left;
|
||||
margin: 4px 4px 0 0;
|
||||
margin: 3px 4px 0 0;
|
||||
}
|
||||
.userInput i,
|
||||
.spaceInput i {
|
||||
@ -400,7 +476,7 @@ ul.tag_input li img {
|
||||
clear: both;
|
||||
display: block;
|
||||
}
|
||||
.wall-entry .preferences {
|
||||
nav-pills.preferences {
|
||||
position: absolute;
|
||||
right: 1px;
|
||||
top: 1px;
|
||||
@ -410,11 +486,11 @@ ul.tag_input li img {
|
||||
margin-top: 10px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.tags {
|
||||
margin: 5px 0;
|
||||
}
|
||||
.tags .tag {
|
||||
margin-bottom: 5px;
|
||||
margin-top: 5px;
|
||||
border-radius: 2px;
|
||||
padding: 4px 8px;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
.placeholder {
|
||||
padding: 15px;
|
||||
@ -453,7 +529,7 @@ ul.tag_input li img {
|
||||
.btn_container .label-public {
|
||||
position: absolute;
|
||||
right: 40px;
|
||||
top: 6px;
|
||||
top: 11px;
|
||||
}
|
||||
.mime {
|
||||
background-repeat: no-repeat;
|
||||
@ -496,6 +572,56 @@ ul.tag_input li img {
|
||||
#postFormFiles_list {
|
||||
padding-left: 0;
|
||||
}
|
||||
.installer .logo {
|
||||
text-align: center;
|
||||
}
|
||||
.upload-box-container {
|
||||
position: relative;
|
||||
}
|
||||
.upload-box {
|
||||
display: none;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0px;
|
||||
width: 100%;
|
||||
height: 100px;
|
||||
padding: 20px 20px 20px 20px;
|
||||
background: #F8F8F8;
|
||||
border: 2px dashed #DDD;
|
||||
text-align: center;
|
||||
border-radius: 3px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.upload-box input[type="file"] {
|
||||
position: absolute;
|
||||
opacity: 0;
|
||||
}
|
||||
.upload-box .upload-box-progress-bar {
|
||||
display: none;
|
||||
}
|
||||
.image-upload-container {
|
||||
position: relative;
|
||||
}
|
||||
.image-upload-container .image-upload-buttons {
|
||||
display: none;
|
||||
position: absolute;
|
||||
right: 5px;
|
||||
bottom: 5px;
|
||||
}
|
||||
.image-upload-container input[type="file"] {
|
||||
position: absolute;
|
||||
opacity: 0;
|
||||
}
|
||||
.image-upload-container .image-upload-loader {
|
||||
display: none;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0px;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
padding: 20px 20px 20px 20px;
|
||||
background: #F8F8F8;
|
||||
}
|
||||
.highlight {
|
||||
background-color: #fffbc1;
|
||||
}
|
||||
@ -529,14 +655,20 @@ textarea.placeholder {
|
||||
#dropdown-notifications .arrow {
|
||||
margin-left: -142px !important;
|
||||
}
|
||||
.profile .media > a {
|
||||
float: none !important;
|
||||
margin-right: 0;
|
||||
}
|
||||
.profile .media > a img {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.profile .statistics {
|
||||
float: none !important;
|
||||
}
|
||||
/* .profile {
|
||||
|
||||
.media > a {
|
||||
float: none !important;
|
||||
margin-right: 0;
|
||||
|
||||
img {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.statistics {
|
||||
float: none !important;
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
244
css/style.less
244
css/style.less
@ -221,8 +221,8 @@ textarea {
|
||||
|
||||
i.approval {
|
||||
position: absolute;
|
||||
left: 4px;
|
||||
top: 34px;
|
||||
left: 2px;
|
||||
top: 36px;
|
||||
font-size: 14px;
|
||||
}
|
||||
i.accepted {
|
||||
@ -327,23 +327,6 @@ textarea {
|
||||
// 5) Panels
|
||||
// --------------------------------------------------
|
||||
|
||||
.panel {
|
||||
|
||||
.statistics {
|
||||
|
||||
margin-top: 40px;
|
||||
margin-right: 20px;
|
||||
|
||||
.entry {
|
||||
margin-left: 20px;
|
||||
|
||||
.count {
|
||||
font-size: 30px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.panel.profile {
|
||||
position: relative;
|
||||
|
||||
@ -361,6 +344,70 @@ textarea {
|
||||
}
|
||||
}
|
||||
|
||||
.panel-profile {
|
||||
|
||||
.panel-profile-header {
|
||||
|
||||
position: relative;
|
||||
border: 3px solid #fff;
|
||||
border-top-right-radius: 3px;
|
||||
border-top-left-radius: 3px;
|
||||
|
||||
.img-profile-header-background {
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
.img-profile-data {
|
||||
position: absolute;
|
||||
height: 100px;
|
||||
width: 100%;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
padding-left: 180px;
|
||||
padding-top: 30px;
|
||||
border-bottom-right-radius: 3px;
|
||||
border-bottom-left-radius: 3px;
|
||||
color: #fff;
|
||||
background: -moz-linear-gradient(top, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0) 1%, rgba(0, 0, 0, 0.58) 100%); /* FF3.6+ */
|
||||
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgba(0, 0, 0, 0)), color-stop(1%, rgba(0, 0, 0, 0)), color-stop(100%, rgba(0, 0, 0, 0.58))); /* Chrome,Safari4+ */
|
||||
background: -webkit-linear-gradient(top, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0) 1%, rgba(0, 0, 0, 0.58) 100%); /* Chrome10+,Safari5.1+ */
|
||||
background: -o-linear-gradient(top, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0) 1%, rgba(0, 0, 0, 0.58) 100%); /* Opera 11.10+ */
|
||||
background: -ms-linear-gradient(top, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0) 1%, rgba(0, 0, 0, 0.58) 100%); /* IE10+ */
|
||||
background: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0) 1%, rgba(0, 0, 0, 0.58) 100%); /* W3C */
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#94000000', GradientType=0); /* IE6-9 */
|
||||
|
||||
h1 {
|
||||
font-size: 30px;
|
||||
font-weight: 100;
|
||||
margin-bottom: 7px;
|
||||
|
||||
}
|
||||
|
||||
h2 {
|
||||
font-size: 16px;
|
||||
font-weight: 400;
|
||||
margin-top: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.profile-user-photo-container {
|
||||
position: absolute;
|
||||
bottom: -50px;
|
||||
left: 15px;
|
||||
|
||||
.profile-user-photo {
|
||||
border: 3px solid #fff;
|
||||
border-radius: 5px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.panel-profile-controls {
|
||||
padding-left: 160px;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//
|
||||
// 6) Pagination
|
||||
// --------------------------------------------------
|
||||
@ -368,6 +415,45 @@ textarea {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
//
|
||||
// Modals
|
||||
// --------------------------------------------------
|
||||
@media screen and (max-width: 768px) {
|
||||
.modal-dialog {
|
||||
width: auto !important;
|
||||
padding-top: 30px;
|
||||
padding-bottom: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
.modal-dialog-extra-small {
|
||||
width: 400px;
|
||||
}
|
||||
|
||||
.modal-dialog-small {
|
||||
width: 500px;
|
||||
}
|
||||
|
||||
.modal-dialog-normal {
|
||||
width: 600px;
|
||||
}
|
||||
|
||||
.modal-dialog-medium {
|
||||
width: 768px;
|
||||
}
|
||||
|
||||
.modal-dialog-large {
|
||||
width: 900px
|
||||
}
|
||||
|
||||
@media screen and (max-width: 920px) {
|
||||
.modal-dialog-large {
|
||||
width: auto !important;
|
||||
padding-top: 30px;
|
||||
padding-bottom: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// 7) Yii Components
|
||||
// --------------------------------------------------
|
||||
@ -437,7 +523,7 @@ ul.tag_input {
|
||||
font-size: 12px !important;
|
||||
padding: 2px;
|
||||
float: left;
|
||||
margin: 4px 4px 0 0;
|
||||
margin: 3px 4px 0 0;
|
||||
}
|
||||
|
||||
.userInput i, .spaceInput i {
|
||||
@ -526,12 +612,10 @@ ul.tag_input {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.wall-entry {
|
||||
.preferences {
|
||||
position: absolute;
|
||||
right: 1px;
|
||||
top: 1px;
|
||||
}
|
||||
nav-pills.preferences {
|
||||
position: absolute;
|
||||
right: 1px;
|
||||
top: 1px;
|
||||
}
|
||||
|
||||
.wall-entry-controls {
|
||||
@ -543,10 +627,11 @@ ul.tag_input {
|
||||
// Tags
|
||||
.tags {
|
||||
|
||||
margin: 5px 0;
|
||||
|
||||
.tag {
|
||||
margin-bottom: 5px;
|
||||
margin-top: 5px;
|
||||
border-radius: 2px;
|
||||
padding: 4px 8px;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
}
|
||||
|
||||
@ -597,7 +682,7 @@ ul.tag_input {
|
||||
.label-public {
|
||||
position: absolute;
|
||||
right: 40px;
|
||||
top: 6px;
|
||||
top: 11px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -656,6 +741,81 @@ ul.tag_input {
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
// Installer
|
||||
.installer {
|
||||
|
||||
.logo {
|
||||
text-align: center
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Upload box
|
||||
|
||||
.upload-box-container {
|
||||
//background-color: red;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.upload-box {
|
||||
display: none;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0px;
|
||||
width: 100%;
|
||||
height: 100px;
|
||||
padding: 20px 20px 20px 20px;
|
||||
background: #F8F8F8;
|
||||
border: 2px dashed #DDD;
|
||||
text-align: center;
|
||||
border-radius: 3px;
|
||||
cursor: pointer;
|
||||
//opacity: 0.9;
|
||||
|
||||
input[type="file"] {
|
||||
position: absolute;
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.upload-box-progress-bar {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
.image-upload-container {
|
||||
|
||||
position: relative;
|
||||
|
||||
.image-upload-buttons {
|
||||
display: none;
|
||||
position: absolute;
|
||||
right: 5px;
|
||||
bottom: 5px;
|
||||
}
|
||||
|
||||
input[type="file"] {
|
||||
position: absolute;
|
||||
//background-color: red;
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.image-upload-loader {
|
||||
display: none;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0px;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
padding: 20px 20px 20px 20px;
|
||||
background: #F8F8F8;
|
||||
|
||||
.image-upload-progess-bar {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// 9) Third Party Tools
|
||||
// --------------------------------------------------
|
||||
@ -707,21 +867,21 @@ input.placeholder, textarea.placeholder {
|
||||
}
|
||||
}
|
||||
|
||||
.profile {
|
||||
/* .profile {
|
||||
|
||||
.media > a {
|
||||
float: none !important;
|
||||
margin-right: 0;
|
||||
.media > a {
|
||||
float: none !important;
|
||||
margin-right: 0;
|
||||
|
||||
img {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
img {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.statistics {
|
||||
float: none !important;
|
||||
}
|
||||
}
|
||||
.statistics {
|
||||
float: none !important;
|
||||
}
|
||||
}*/
|
||||
|
||||
}
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
?>
|
||||
|
||||
|
||||
<div class="container" style="text-align: center;">
|
||||
<h1><?php echo Yii::app()->name; ?></h1>
|
||||
<div class="container outsite" style="text-align: center;">
|
||||
<h1 class="animated fadeIn"><?php echo Yii::app()->name; ?></h1>
|
||||
<br>
|
||||
|
||||
<div class="panel panel-default" style="max-width: 300px; margin: 0 auto 20px; text-align: left;">
|
||||
<div class="panel panel-default animated bounceIn" style="max-width: 300px; margin: 0 auto 20px; text-align: left;">
|
||||
|
||||
<div class="panel-heading"><?php echo Yii::t('UserModule.auth', 'Please sign in'); ?></div>
|
||||
<div class="panel-heading"><?php echo Yii::t('UserModule.auth', '<strong>Please</strong> sign in'); ?></div>
|
||||
|
||||
<div class="panel-body">
|
||||
<?php
|
||||
@ -45,7 +45,8 @@
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
<?php echo CHtml::submitButton(Yii::t('UserModule.base', 'Sign in'), array('class' => 'btn btn-large btn-primary')); ?><br>
|
||||
<?php echo CHtml::submitButton(Yii::t('UserModule.base', 'Sign in'), array('class' => 'btn btn-large btn-primary')); ?>
|
||||
<br>
|
||||
|
||||
<?php $this->endWidget(); ?>
|
||||
|
||||
@ -54,12 +55,13 @@
|
||||
|
||||
</div>
|
||||
<a href="<?php echo $this->createUrl('//user/auth/recoverPassword'); ?>"><?php echo Yii::t('UserModule.auth', 'Forgot your password?') ?></a>
|
||||
<br><br><br>
|
||||
<br><br><br>
|
||||
|
||||
<?php if ($canRegister) : ?>
|
||||
<div class="panel panel-default" style="max-width: 300px; margin: 0 auto 20px; text-align: left;">
|
||||
<div class="panel panel-default animated bounceInLeft"
|
||||
style="max-width: 300px; margin: 0 auto 20px; text-align: left;">
|
||||
|
||||
<div class="panel-heading"><?php echo Yii::t('UserModule.auth', 'Registration') ?></div>
|
||||
<div class="panel-heading"><?php echo Yii::t('UserModule.auth', '<strong>Sign</strong> up') ?></div>
|
||||
|
||||
<div class="panel-body">
|
||||
|
||||
@ -67,7 +69,7 @@
|
||||
<?php
|
||||
$form = $this->beginWidget('CActiveForm', array(
|
||||
'id' => 'account-register-form',
|
||||
'enableAjaxValidation' => true,
|
||||
'enableAjaxValidation' => false,
|
||||
));
|
||||
?>
|
||||
|
||||
@ -85,7 +87,7 @@
|
||||
</div>
|
||||
|
||||
<script type="text/javascript">
|
||||
$(function() {
|
||||
$(function () {
|
||||
// set cursor ot login field
|
||||
$('#login_username').focus();
|
||||
})
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user