rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-17 06:52:27 +01:00
Code Issues Releases Activity

ui: machines and trainings list : remove the description

Browse Source
This commit is contained in:
cyril 2016-09-23 14:42:53 +02:00
parent 70a95ffcd7
commit c14a4d03c5
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/app.base.scss
View File

@ -62,11 +62,9 @@ p {
line-height: rem-calc(24);
&.intro, .intro {
font-family: $font-proxima-condensed;
font-size: rem-calc(16);
line-height: rem-calc(24);
margin: 1.038em 0 30px 0;
font-weight: 600;
}
}

11
app/assets/templates/machines/index.html.erb
View File

@ -27,15 +27,14 @@
<div class="col-xs-12 col-sm-6 col-md-4" ng-repeat="machine in machines.slice(3*$index, 3*$index + 3)">
<div class="widget panel panel-default" ng-click="showMachine(machine)">
<div class="panel-heading picture" ng-if="!machine.machine_image">
<div class="widget panel panel-default">
<div class="panel-heading picture" ng-if="!machine.machine_image" ng-click="showMachine(machine)">
<img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:FontAwesome/icon" bs-holder class="img-responsive">
</div>
<div class="panel-heading picture" style="background-image:url({{machine.machine_image}})" ng-if="machine.machine_image">
<div class="panel-heading picture" style="background-image:url({{machine.machine_image}})" ng-if="machine.machine_image" ng-click="showMachine(machine)">
</div>
<div class="panel-body" style="heigth:170px;">
<h1 class="m-b">{{machine.name}}</h1>
<p ng-bind-html="machine.description | simpleText | humanize : 140 | breakFilter"></p>
<div class="panel-body">
<h1 class="text-center m-b">{{machine.name}}</h1>
</div>
<div class="panel-footer no-padder">

11
app/assets/templates/trainings/index.html.erb
View File

@ -23,16 +23,13 @@
<div class="widget panel panel-default">
<div class="panel-heading picture" ng-if="!training.training_image">
<div class="panel-heading picture" ng-if="!training.training_image" ng-click="showTraining(training)">
<img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:FontAwesome/icon" bs-holder class="img-responsive">
</div>
<div class="panel-heading picture" style="background-image:url({{training.training_image}})" ng-if="training.training_image">
<div class="panel-heading picture" style="background-image:url({{training.training_image}})" ng-if="training.training_image" ng-click="showTraining(training)">
</div>
<div class="panel-body" style="heigth:170px;">
<h1 class="m-b">{{training.name}}</h1>
<div ng-if="training.description">
<p ng-bind-html="training.description | simpleText | humanize : 140 | breakFilter"></p>
</div>
<div class="panel-body">
<h1 class="m-b text-center">{{training.name}}</h1>
</div>
<div class="panel-footer no-padder">