Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Choose a Base Repository
hypothesis/h
40a/h
AFDudley/h
BigBlueHat/h
BinaryStars/h
CCH543/h
Cinemacloud/h
Ericgood/h
FTG-003/h
Forethinker/h
GratefulTony/h
HGldJ1966/h
JJediny/h
John-Williams/h
Laurian/h
LittleFancy/h
MattyQ/h
Mishkin2015/h
RichardLitt/h
Staffan1/h
SteelWagstaff/h
TowerBR/h
VanyTang/h
abigailricarte/h
ackermann/h
alecchap/h
alesarrett/h
alexsegura/h
almereyda/h
alon/h
andzi/h
angelicxsoul/h
ansmoh/h
apurvajalit/h
arjunvasan/h
asdevor/h
bZichett/h
badgettrg/Webmarks
balmas/h
balupton/h
bbarker/h
bennlich/h
benthor/h
blakewest/h
bogste/h
bradparks/h
brittanystoroz/h
buiquangchien/h
cdchapman/h
charblanc/h
chowsamihq/h
chr7stos/Webmarks
chrber/h
chrismPssina/h
christinaphamAD/h
cmbirk/h
codeaudit/h
coolcool21/h
cove/h
csillag/h
danjimilk/h
dannyhope/h
daredream/h
davidmcclure/h
dennisplucinik/h
dezynetechnologies/h
diegodlh/h
djcun95/h
donsequitur/h
edsu/h
eiro10/h
emckean/h
ercchy/h
eshellman/h
fangang123/h
fchasen/h
fcrimins/h
fhirsch/h
ficolo/h
fragkopoulos/h
gauravkeerthi/h
geass/h
gergely-ujvari/h
gitter-badger/h
gnott/h
gobengo/h
gorinovic/h
gus3000/h
hashin/h
helemaalbigt/h
hmstepanek/h
hwasiti/h
hylhero/h
hyperstudio/h
iHDeveloper/h
imeysam/h
jackspaceBerkeley/h
jarey/h
jasdeep/h
jason790/h
jasonzou/j
jazahn/h
jccr/h
jean/h
jeka57/h
jeremydean/h
jermnelson/h
jibe-b/h
jnishiyama/h
jojksd/h
jpadilla/h
jtremback/h
judell/h
juli-so/h
kabacs/h
karissa/h
kaushikvijay/h
kaydoh/h
kill4uk/h
klopiinas/h
klrkdekira/h
koulihong311/h
krassif/h
krstnkngs/h
leoqmp/h
linhua55/h
lucadealfaro/h
lyspooner/h
lyzadanger/h
m1yag1/h
magee/h
mambocab/h
manunymous/h
maraino/h
mari-ja/h
markbarratt/h
martinq/h
mbbaig/h
mcarv63/h
meawoppl/h
meflyup/h
metasj/h
mgasner/h
mgax/h
mollycr/h
mrchrisadams/h
mrienstra/h
mshavlovsky/h
muddasani/h
nagyist/hyphothesis-h
nagyistoce/hypothesis-h
nanxio/h
neozhangthe1/h
ningyifan/h
nkingsley/h
nlholdem/h
nlisgo/h
noscripter/h
nshkuro/h
odnodn/h
oliversauter/h
openbizgit/h
opengovfoundation/h
openstax/hypothesis-server
ouroboros8/h
pablomarti/h
pamo/h
philipn/h
philschatz/h
pinballwonder/h
plainspace/h
raowl/h
rickyhan/h
rmoorman/h
rmtsukuru/h
robertknight/h
rowhit/h
rsarxiv/h
saakaifoundry/h
samrose/h
scharf/h
shepazu/h
sherah/h
shofheinz/h
soapdog/h
ssin122/test-h
st-fresh/h
stuk88/h
sylvanmist/h
tetratorus/h
tilgovi/h
tomnar/h
trivenews/h
truthadjustr/h
utngz/h
voidfiles/h
wenchen/h
yargevad/h
yumatch/h
zshen777/h
Nothing to show
Choose a Head Repository
hypothesis/h
40a/h
AFDudley/h
BigBlueHat/h
BinaryStars/h
CCH543/h
Cinemacloud/h
Ericgood/h
FTG-003/h
Forethinker/h
GratefulTony/h
HGldJ1966/h
JJediny/h
John-Williams/h
Laurian/h
LittleFancy/h
MattyQ/h
Mishkin2015/h
RichardLitt/h
Staffan1/h
SteelWagstaff/h
TowerBR/h
VanyTang/h
abigailricarte/h
ackermann/h
alecchap/h
alesarrett/h
alexsegura/h
almereyda/h
alon/h
andzi/h
angelicxsoul/h
ansmoh/h
apurvajalit/h
arjunvasan/h
asdevor/h
bZichett/h
badgettrg/Webmarks
balmas/h
balupton/h
bbarker/h
bennlich/h
benthor/h
blakewest/h
bogste/h
bradparks/h
brittanystoroz/h
buiquangchien/h
cdchapman/h
charblanc/h
chowsamihq/h
chr7stos/Webmarks
chrber/h
chrismPssina/h
christinaphamAD/h
cmbirk/h
codeaudit/h
coolcool21/h
cove/h
csillag/h
danjimilk/h
dannyhope/h
daredream/h
davidmcclure/h
dennisplucinik/h
dezynetechnologies/h
diegodlh/h
djcun95/h
donsequitur/h
edsu/h
eiro10/h
emckean/h
ercchy/h
eshellman/h
fangang123/h
fchasen/h
fcrimins/h
fhirsch/h
ficolo/h
fragkopoulos/h
gauravkeerthi/h
geass/h
gergely-ujvari/h
gitter-badger/h
gnott/h
gobengo/h
gorinovic/h
gus3000/h
hashin/h
helemaalbigt/h
hmstepanek/h
hwasiti/h
hylhero/h
hyperstudio/h
iHDeveloper/h
imeysam/h
jackspaceBerkeley/h
jarey/h
jasdeep/h
jason790/h
jasonzou/j
jazahn/h
jccr/h
jean/h
jeka57/h
jeremydean/h
jermnelson/h
jibe-b/h
jnishiyama/h
jojksd/h
jpadilla/h
jtremback/h
judell/h
juli-so/h
kabacs/h
karissa/h
kaushikvijay/h
kaydoh/h
kill4uk/h
klopiinas/h
klrkdekira/h
koulihong311/h
krassif/h
krstnkngs/h
leoqmp/h
linhua55/h
lucadealfaro/h
lyspooner/h
lyzadanger/h
m1yag1/h
magee/h
mambocab/h
manunymous/h
maraino/h
mari-ja/h
markbarratt/h
martinq/h
mbbaig/h
mcarv63/h
meawoppl/h
meflyup/h
metasj/h
mgasner/h
mgax/h
mollycr/h
mrchrisadams/h
mrienstra/h
mshavlovsky/h
muddasani/h
nagyist/hyphothesis-h
nagyistoce/hypothesis-h
nanxio/h
neozhangthe1/h
ningyifan/h
nkingsley/h
nlholdem/h
nlisgo/h
noscripter/h
nshkuro/h
odnodn/h
oliversauter/h
openbizgit/h
opengovfoundation/h
openstax/hypothesis-server
ouroboros8/h
pablomarti/h
pamo/h
philipn/h
philschatz/h
pinballwonder/h
plainspace/h
raowl/h
rickyhan/h
rmoorman/h
rmtsukuru/h
robertknight/h
rowhit/h
rsarxiv/h
saakaifoundry/h
samrose/h
scharf/h
shepazu/h
sherah/h
shofheinz/h
soapdog/h
ssin122/test-h
st-fresh/h
stuk88/h
sylvanmist/h
tetratorus/h
tilgovi/h
tomnar/h
trivenews/h
truthadjustr/h
utngz/h
voidfiles/h
wenchen/h
yargevad/h
yumatch/h
zshen777/h
Nothing to show
  • 11 commits
  • 28 files changed
  • 0 commit comments
  • 1 contributor
Commits on Nov 25, 2015
Move the hypothes.is front page into the app
Initial move of the hypothes.is front page into the app, much tidying
up and migrating of resources stil to do.

For this commit I did a view-source on https://hypothes.is/ and
copy-pasted it into home.html.jinja2, then:

- Routed "/" to home.html.jinja2, replaces the previous "/" route that went to
  the help page
- Reformatted the HTML to make it more manageable
- Removed the link to the empty RSS comments feed
- Removed tags in the <head> to do with installing the site as a web app on
  iOS, Android and Windows Mobile
- Removed WordPress RSD EditURI metadata tags
- Removed wlwmanifest.xml metadata link
- Removed the <link rel="shortlink" whose value was the same as the
  canonical link
- Removed the Google Analytics JavaScript
- Removed the "You need to update your browser" message and browsehappy.com
  link that was shown to IE < 9 users
- Removed the broken <script> link to showhighlights.js
- Removed inline JS and CSS to do with "WordPress emojis"

This "works" but still pulls all of the resources (CSS, images, js...) from the
production WordPress instance. Much tidying up still to do.
Copy Font Awesome from WordPress into app
This uses a completely separate front_css webassets bundle for now, the
CSS for the front page should be integrated with that in the site_css
bundle later.
Remove wp-syntax CSS link
This is a syntax-highlighting plugin for WordPress
Copy the WordPress theme CSS into the app
This just copies the already compiled and minified main.css file into
the app, doesn't yet try to copy the source Sass files and recreate the
assets pipeline for them.
Use jquery from webassets not WordPress
Also move the <script> tag from the <head> to the bottom of the <body>.

This also removes the jquery-migrate.min.js that was previously included
as it doesn't appear to be needed.
Use {{ base_url }}
Instead of hardcoding http(s)://hypothes.is/.
Showing with 2,828 additions and 4 deletions.
  1. +1 −0 h/app.py
  2. +15 −0 h/assets.yaml
  3. +13 −0 h/home.py
  4. BIN h/static/images/apple-touch-icons/apple-touch-icon-114x114.png
  5. BIN h/static/images/apple-touch-icons/apple-touch-icon-120x120.png
  6. BIN h/static/images/apple-touch-icons/apple-touch-icon-144x144.png
  7. BIN h/static/images/apple-touch-icons/apple-touch-icon-152x152.png
  8. BIN h/static/images/apple-touch-icons/apple-touch-icon-180x180.png
  9. BIN h/static/images/apple-touch-icons/apple-touch-icon-57x57.png
  10. BIN h/static/images/apple-touch-icons/apple-touch-icon-60x60.png
  11. BIN h/static/images/apple-touch-icons/apple-touch-icon-72x72.png
  12. BIN h/static/images/apple-touch-icons/apple-touch-icon-76x76.png
  13. BIN h/static/images/browser-chrome-64x64.png
  14. BIN h/static/images/favicons/android-chrome-192x192.png
  15. BIN h/static/images/favicons/favicon-16x16.png
  16. BIN h/static/images/favicons/favicon-32x32.png
  17. BIN h/static/images/favicons/favicon-96x96.png
  18. BIN h/static/images/favicons/favicon.ico
  19. +2 −0 h/static/styles/front-page/main.css
  20. +1,801 −0 h/static/styles/vendor/css/font-awesome.css
  21. +97 −0 h/static/styles/vendor/fonts/fontawesome-license.txt
  22. BIN h/static/styles/vendor/fonts/fontawesome-webfont.eot
  23. +565 −0 h/static/styles/vendor/fonts/fontawesome-webfont.svg
  24. BIN h/static/styles/vendor/fonts/fontawesome-webfont.ttf
  25. BIN h/static/styles/vendor/fonts/fontawesome-webfont.woff
  26. BIN h/static/styles/vendor/fonts/fontawesome-webfont.woff2
  27. +334 −0 h/templates/home.html.jinja2
  28. +0 −4 h/views.py
View
@@ -73,6 +73,7 @@ def includeme(config):
config.include('h.badge')
config.include('h.claim')
config.include('h.groups')
config.include('h.home')
config.include('h.notification')
config.include('h.queue')
config.include('h.streamer')
View
@@ -220,13 +220,28 @@ site_css:
filters: cleancss
contents:
- h:static/styles/vendor/icomoon.css
- h:static/styles/vendor/css/font-awesome.css
- output: h:static/styles/site.css
filters: compass,postcss
contents:
- h:static/styles/site.scss
depends:
- h:static/styles/*.scss
# the H website front page (separate assets from the rest of the site for now)
front_page_js:
contents:
- jquery
front_page_css:
output: styles/front-page.min.css
contents:
- h:static/styles/front-page/main.css
- output: h:static/styles/front-page.css
filters: cleancss
contents:
- h:static/styles/vendor/css/font-awesome.css
# Help page
help_page_css:
output: styles/help-page.min.css
View
@@ -0,0 +1,13 @@
"""The home/front page of the //hypothes.is/ site."""
from pyramid import view
@view.view_config(route_name='index',
request_method='GET',
renderer='h:templates/home.html.jinja2')
def index(context, request):
return {}
def includeme(config):
config.add_route('index', '/')
config.scan(__name__)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

No commit comments for this range