summaryrefslogtreecommitdiff
path: root/static/website/bootstrap-css
diff options
context:
space:
mode:
authorprashantsinalkar2019-10-02 20:32:05 +0530
committerprashantsinalkar2019-10-02 20:32:05 +0530
commitcb37e15ceb336de7ba94d90805ef1531c47d5c96 (patch)
tree9cba0c741a7cfe3222e2c17401e72b2acc8dedf7 /static/website/bootstrap-css
parent76dcbadbf71febe93fb9d2ffd51b2f3ae54233a2 (diff)
parent070cb90095df4ab5bc7b6e28fd13bb12df29e1f7 (diff)
downloadR_on_Cloud_Web_Interface-cb37e15ceb336de7ba94d90805ef1531c47d5c96.tar.gz
R_on_Cloud_Web_Interface-cb37e15ceb336de7ba94d90805ef1531c47d5c96.tar.bz2
R_on_Cloud_Web_Interface-cb37e15ceb336de7ba94d90805ef1531c47d5c96.zip
fixed conflict
Diffstat (limited to 'static/website/bootstrap-css')
-rw-r--r--static/website/bootstrap-css/custom.css11
1 files changed, 0 insertions, 11 deletions
diff --git a/static/website/bootstrap-css/custom.css b/static/website/bootstrap-css/custom.css
deleted file mode 100644
index 61177ba..0000000
--- a/static/website/bootstrap-css/custom.css
+++ /dev/null
@@ -1,11 +0,0 @@
-div.form-inline label.col-md-4{justify-content:flex-end;}
-#diff-area{white-space:pre;}
-ins{text-decoration:none;background-color:#28a745!important}
-del{text-decoration:none;background-color:#dc3545!important}
-#diff_wrapper .modal-dialog{max-width:100%;width:auto !important;display:inline-block;}
-.modal.in{text-align:center;}
-.bg-dark{background-color:#0f2342 !important;}
-.ajax-loader{position:relative;display:inline-block;top:1px;left:5px;width:16px;height:11px;background:url("../images/ajax-loader.gif");background-size:cover;}
-#success, #fail{display:none;}
-.nav-link{margin-top:0.5rem;!important}
-.CodeMirror{min-height:58vh;!important}