Merge branch 'design_team' into ldap
Conflicts: app/assets/stylesheets/new_admin.css.erb app/assets/stylesheets/widget.css
This commit is contained in:
Christophe Vilayphiou
commit
5a423178e3
|
|
@ -5,11 +5,11 @@
|
|||
*= require reset
|
||||
*= require_self
|
||||
*= require message
|
||||
*= require style
|
||||
*= require bootstrap
|
||||
*= require bootstrap-orbit
|
||||
*= require list
|
||||
*= require style
|
||||
*= widget
|
||||
*= require widgets
|
||||
*= require scroll_style
|
||||
*= require isotope
|
||||
*/
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,148 +0,0 @@
|
|||
.widget-size-300 {
|
||||
width:298px;
|
||||
}
|
||||
.widget-box {
|
||||
background-color: #FFF;
|
||||
overflow: hidden;
|
||||
min-width: 300px;
|
||||
margin: 0 0 5px 5px;
|
||||
position:relative;
|
||||
}
|
||||
.widget-box .widget-title {
|
||||
color: #FFF;
|
||||
padding-left: 5px;
|
||||
border-radius: 5px 5px 0 0;
|
||||
-moz-border-radius: 5px 5px 0 0;
|
||||
-webkit-border-radius: 5px 5px 0 0;
|
||||
background-image: -moz-linear-gradient(top, #B7B7B7, #9d9d9d);
|
||||
background-image: -ms-linear-gradient(top, #B7B7B7, #9d9d9d);
|
||||
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B7B7B7), to(#9d9d9d));
|
||||
background-image: -webkit-linear-gradient(top, #B7B7B7, #9d9d9d);
|
||||
background-image: -o-linear-gradient(top, #B7B7B7, #9d9d9d);
|
||||
background-image: linear-gradient(top, #B7B7B7, #9d9d9d);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#B7B7B7', endColorstr='#9d9d9d', GradientType=0);
|
||||
}
|
||||
.widget-box .widget-title [class^="icons-"] {
|
||||
margin: 3px 5px 0 2px;
|
||||
}
|
||||
.widget-box .widget-content {
|
||||
padding: 10px;
|
||||
border-width: 0 1px 1px;
|
||||
border-style: solid;
|
||||
border-color: #CCCCCC;
|
||||
border-radius: 0 0 5px 5px;
|
||||
-moz-border-radius: 0 0 5px 5px;
|
||||
-webkit-border-radius: 0 0 5px 5px;
|
||||
}
|
||||
.widget-box .form-horizontal .control-group > label {
|
||||
width: 50px;
|
||||
}
|
||||
.widget-box .form-horizontal .controls {
|
||||
margin-left: 60px;
|
||||
}
|
||||
.widget-action {
|
||||
position:absolute;
|
||||
right:1px;
|
||||
top:6px;
|
||||
}
|
||||
.action {
|
||||
float: left;
|
||||
display:inline-block;
|
||||
margin-right: 5px;
|
||||
opacity: 0.8;
|
||||
filter: alpha(opacity=80);
|
||||
}
|
||||
.action:hover {
|
||||
opacity: 1;
|
||||
filter: alpha(opacity=100);
|
||||
cursor: pointer;
|
||||
}
|
||||
.select-role {
|
||||
display:none;
|
||||
overflow:hidden;
|
||||
}
|
||||
.file-upload {
|
||||
position:relative;
|
||||
overflow: hidden;
|
||||
}
|
||||
.file-upload .file-name {
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
border-style: solid;
|
||||
border-width: 1px 1px 1px 0;
|
||||
border-color: #CCC;
|
||||
display: inline-block;
|
||||
float: left;
|
||||
padding: 4px 10px;
|
||||
height: 18px;
|
||||
line-height: 18px;
|
||||
-webkit-border-radius: 0 3px 3px 0;
|
||||
-moz-border-radius: 0 3px 3px 0;
|
||||
border-radius: 0 3px 3px 0;
|
||||
text-align: left;
|
||||
margin: 0;
|
||||
width: 182px;
|
||||
}
|
||||
.file-upload .upload {
|
||||
margin:0;
|
||||
padding:0;
|
||||
position:absolute;
|
||||
top: 0;
|
||||
left:0;
|
||||
opacity:.0;
|
||||
font-size: 60px;
|
||||
left: -595px/9;
|
||||
filter: alpha(opacity: 0);
|
||||
outline: none;
|
||||
}
|
||||
.file-upload .upload:focus {
|
||||
position:absolute;
|
||||
}
|
||||
.upload-picture {
|
||||
margin-bottom: 5px;
|
||||
text-align: center;
|
||||
width: 276px;
|
||||
overflow: hidden;
|
||||
height: 90px;
|
||||
}
|
||||
.upload-picture img {
|
||||
left: 0;
|
||||
margin-top: -15%;
|
||||
width: 100%;
|
||||
}
|
||||
.widget-box .widgetInfo {
|
||||
display: inline-block;
|
||||
text-align: center;
|
||||
width: 255px;
|
||||
margin : 0px 0 5px;
|
||||
padding: 5px 10px;
|
||||
}
|
||||
.file-upload .input-medium {
|
||||
border-radius: 3px 3px 3px 3px !important;
|
||||
width: 267px;
|
||||
position: relative;
|
||||
z-index: 5;
|
||||
}
|
||||
#widget-link table {
|
||||
margin-bottom:0
|
||||
}
|
||||
/*Date*/
|
||||
.showDate {
|
||||
border-style: solid;
|
||||
border-width: 1px 0 1px 1px;
|
||||
border-color: #CCC;
|
||||
display: inline-block;
|
||||
float: left;
|
||||
padding: 4px 10px;
|
||||
height: 18px;
|
||||
line-height: 18px;
|
||||
-webkit-border-radius: 3px 0 0 3px;
|
||||
-moz-border-radius: 3px 0 0 3px;
|
||||
border-radius: 3px 0 0 3px;
|
||||
text-align: center;
|
||||
}
|
||||
.calendarInput {
|
||||
position: absolute;
|
||||
visibility: hidden;
|
||||
left: 11px;
|
||||
}
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
/*Widget*/
|
||||
.widget-size-300 {
|
||||
width:298px;
|
||||
}
|
||||
|
|
@ -50,11 +51,11 @@
|
|||
display:inline-block;
|
||||
margin-right: 5px;
|
||||
opacity: 0.8;
|
||||
filter: alpha(opacity=80);
|
||||
filter: alpha(opacity:80);
|
||||
}
|
||||
.action:hover {
|
||||
opacity: 1;
|
||||
filter: alpha(opacity=100);
|
||||
filter: alpha(opacity:100);
|
||||
cursor: pointer;
|
||||
}
|
||||
.select-role {
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
|
|||
end
|
||||
|
||||
def show
|
||||
@bulletin = Bulletin.can_display.where.where(_id: params[:id])
|
||||
get_categorys
|
||||
@bulletin = Bulletin.can_display.where(_id: params[:id]).first
|
||||
get_categorys
|
||||
end
|
||||
|
||||
|
||||
|
|
|
|||
Reference in New Issue