Skip to content
This repository has been archived by the owner on Dec 27, 2023. It is now read-only.

Updated the cleartext element #337

Closed
wants to merge 9 commits into from
+15 −0
Closed

Updated the cleartext element #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
11f2f42
FIxed the console.log error for show.js file
opg7371 Feb 6, 2016
5528863
Updated the cleartext element
opg7371 Feb 19, 2016
5b863e5
Updated the font-size of the cleartext element
opg7371 Feb 21, 2016
5104e19
Merge branch 'develop' of https://www.github.com/privly/privly-applic…
opg7371 Feb 23, 2016
094d5d8
Updated the cleartext element
opg7371 Feb 19, 2016
a3ad97b
Merge branch 'develop-cleartext-component' of https://github.com/opg7…
opg7371 Feb 23, 2016
61aa573
Updated the cleartext element
opg7371 Feb 25, 2016
21ac2ed
Updated the cleartext element
opg7371 Feb 25, 2016
e5bbfd4
Merge branch 'develop-cleartext-component' of https://github.com/opg7…
opg7371 Feb 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions PlainPost/show.html.subtemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,16 @@
{% block javascripts %}
<script type="text/javascript" src="../vendor/jquery.min.js"></script>
<script type="text/javascript" src="../vendor/markdown.js"></script>
<<<<<<< HEAD
<script type="text/javascript" src="../shared/javascripts/privly-web/show.js"></script>
<script type="text/javascript" src="js/show.js"></script>
<script name="PrivlyTopJS" src="../vendor/jquery.autosize.js" type="text/javascript"></script>
=======
<script type="text/javascript" src="../shared/javascripts/viewAdapters/show.js"></script>
<script type="text/javascript" src="js/plainpostModel.js"></script>
<script type="text/javascript" src="js/controllers/show.js"></script>
<meta name="PrivlyTopJS" content="../vendor/jquery.autosize.js" />
>>>>>>> d1eba2dddfbcdea05ccd4d6b9e342a9e71c4f7ac
{% endblock %}


Expand Down
9 changes: 9 additions & 0 deletions shared/css/top/top.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,15 @@ body {

#cleartext {
height: 100%;
<<<<<<< HEAD
<<<<<<< HEAD
font-size: 23px;
=======
font-size: 17px;
>>>>>>> 5528863... Updated the cleartext element
=======
font-size: 23px;
>>>>>>> 5b863e5... Updated the font-size of the cleartext element
}

@media(min-width: 992px){
Expand Down