| <div id="pmodal-instagram"> | |
| <div class="instagram-images"> | |
| <!--store owner's intagram pic for this product | |
| shown to himself (edit elements are visible, | |
| has class "store-owner show-edit") --> | |
| <div style="background-image: url( '/static/images/dev/p.jpg' )" class="instagram-image store-owner show-edit"> | |
| <div class="instagram-selector"> | |
| <div class="mk-vertical-center-container" style="height: 100%"> | |
| <div class="mk-vertical-center-element"> |
| # Example YAML for the bare minimum of required elements | |
| swagger: 2.0 | |
| info: | |
| version: "1.0.0" | |
| title: petstore | |
| paths: | |
| /users: | |
| get: | |
| responses: | |
| "200": |
| { | |
| "swagger": 2, | |
| "info": { | |
| "version": "1.0.0", | |
| "title": "petstore" | |
| }, | |
| "paths": { | |
| "/users": { | |
| "get": { | |
| "responses": { |
| { | |
| "swagger": 2, | |
| "info": { | |
| "version": "1.0.0", | |
| "title": "llllllllllllllllllllllllllllllllllllllllllll" | |
| }, | |
| "paths": { | |
| "/users": { | |
| "get": { | |
| "responses": { |
| { | |
| "swagger": 2, | |
| "info": { | |
| "title": "Merkatsu API", | |
| "description": "Move your app forward with the Merkatsu API", | |
| "version": "0.0.1" | |
| }, | |
| "host": "localhost.com:2000", | |
| "schemes": [ | |
| "http" |
| # this is an example of the Uber API | |
| # as a demonstration of an API spec in YAML | |
| swagger: 2 | |
| info: | |
| title: Merkatsu API | |
| description: Move your app forward with the Merkatsu API | |
| version: "0.0.1" | |
| # the domain of the service | |
| host: localhost.com:2000 | |
| # array of all schemes that your API supports |
| asdasdadd | |
| asd | |
| asd | |
| as | |
| dsa | |
| d |
##git merge –strategy=theirs (closest we can get)
get a temp copy of the branch you want to 'clone' into another
git checkout -b tmp <branch to copy from>
merge our version of the branch into the upstream with ours strategy
git merge --strategy=ours
| <div class="avatar avatar--medium host hidden-xs" style="background-image: url("http://res.cloudinary.com/altar/image/upload/v1455021370/venga/avatars/paolo.png"); background-position: 50% 50%;"> | |
| <div class="avatar-tooltip"> | |
| <div> | |
| <div class="arrow"></div> | |
| <div class="row"> <img class="avatar avatar--large tooltipAvatar" src="http://res.cloudinary.com/altar/image/upload/v1455021370/venga/avatars/paolo.png"> </div> | |
| <div class="row"> | |
| <h1 class="name ng-binding">Paolo D.</h1> </div> | |
| <div class="row stars text-center"> <i class="fa fa-star"></i> <i class="fa fa-star"></i> <i class="fa fa-star"></i> <i class="fa fa-star"></i> <i class="fa fa-star"></i> </div> | |
| <div class="row"> <span class="hashTag">#happy</span> <span class="hashTag">#friendly</span> </div> | |
| <div class="row"> |
| <div ng-style="{'background-position': event.host.profile_picture.center_x+'% '+event.host.profile_picture.center_y+'%', 'background-image':'url('+global.imgCDN+'/'+event.host.profile_picture.url+')'}" class="avatar avatar--medium host hidden-xs" style="background-image: url("http://res.cloudinary.com/altar/image/upload/v1455021370/venga/avatars/paolo.png"); background-position: 50% 50%;"> | |
| <div class="avatar-tooltip" person="event.host" cdn="http://res.cloudinary.com/altar/image/upload" class="ng-isolate-scope"> | |
| <div ng-show="avatarTooltip.person && avatarTooltip.mouseIn" class="" style=""> | |
| <div class="arrow"></div> | |
| <div class="row"> <img class="avatar avatar--large tooltipAvatar" ng-src="http://res.cloudinary.com/altar/image/upload/v1455021370/venga/avatars/paolo.png" src="http://res.cloudinary.com/altar/image/upload/v1455021370/venga/avatars/paolo.png"> </div> | |
| <div class="row"> | |
| <h1 class="name ng-binding">Paolo D.</h1> </div> |