Changeset a9c1355 in prototipo_portal_2018 for prototipo/static


Ignore:
Timestamp:
Oct 19, 2017, 5:35:14 PM (7 years ago)
Author:
José Sulbarán <jsulbaran@…>
Branches:
master
Children:
307a8cc
Parents:
e3349ca (diff), e35a1b8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Realizando la mezcla

Location:
prototipo/static
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • prototipo/static/css/style.css

    re3349ca ra9c1355  
    9898
    9999.text {
    100   border-radius: 20px;
     100  border-radius: 0px;
    101101  color: rgba(255, 255, 255, .5);
    102102  display: inline-block;
  • prototipo/static/js/docsDraggable.js

    re3349ca ra9c1355  
    8787
    8888      $("#container1").attr("style", "background-image: url('"+__id+"');background-size: cover; background-repeat: no-repeat;  height:"+viewdimen.height+"px; width:"+viewdimen.width+"px");     
     89      $("#container1").attr("style", "background-image: url('"+__id+"');background-size: cover; background-repeat: no-repeat;  height:"+(viewdimen.height)+"px; width:"+(viewdimen.width)+"px");
     90     
    8991
    9092    });
Note: See TracChangeset for help on using the changeset viewer.